diff --git a/3.10/Dockerfile b/3.10/Dockerfile
index 59429a7..9ad35e7 100644
--- a/3.10/Dockerfile
+++ b/3.10/Dockerfile
@@ -8,15 +8,15 @@ RUN apt-get update && \
         git=1:2.20.1-2+deb10u3 \
         curl \
         npm=5.8.0+ds6-4+deb10u2 && \
-    pip3 install --no-cache-dir --upgrade pip==22.1.2 && \
-    npm install npm@latest -g && \
-    npm install -g serverless@3.24.1 && \
+    pip3 install --no-cache-dir --upgrade pip==23.3.1 && \
+    npm install npm@7.0 -g && \
+    npm install -g serverless@3.36.0 && \
     npm install -g serverless-compose@2.4.0 &&\
     apt-get -q -y clean && \
     rm -rf /var/cache/apt/archives/* /var/lib/apt/lists/*
 
 ARG APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1
-RUN curl -sL https://deb.nodesource.com/setup_14.x | bash
+RUN curl -sL https://deb.nodesource.com/setup_16.x | bash -
 RUN apt-get install -y nodejs
 
 WORKDIR /work
diff --git a/3.11/Dockerfile b/3.11/Dockerfile
new file mode 100644
index 0000000..3b37fc5
--- /dev/null
+++ b/3.11/Dockerfile
@@ -0,0 +1,24 @@
+FROM python:3.11-slim-buster
+
+RUN apt-get update && \
+    apt-get install -y \
+        wget=1.20.1-1.1 \
+        zip=3.0-11+b1 \
+        unzip=6.0-23+deb10u2 \
+        git=1:2.20.1-2+deb10u3 \
+        curl \
+        npm=5.8.0+ds6-4+deb10u2 && \
+    pip3 install --no-cache-dir --upgrade pip==23.3.1 && \
+    npm install npm@7.0 -g && \
+    npm install -g serverless@3.36.0 && \
+    npm install -g serverless-compose@2.4.0 &&\
+    apt-get -q -y clean && \
+    rm -rf /var/cache/apt/archives/* /var/lib/apt/lists/*
+
+ARG APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1
+RUN curl -sL https://deb.nodesource.com/setup_16.x | bash -
+RUN apt-get install -y nodejs
+
+WORKDIR /work
+
+ENTRYPOINT ["/bin/sh"]
\ No newline at end of file
diff --git a/3.9/Dockerfile b/3.9/Dockerfile
index e50fc37..43da8a9 100644
--- a/3.9/Dockerfile
+++ b/3.9/Dockerfile
@@ -8,15 +8,15 @@ RUN apt-get update && \
         git=1:2.20.1-2+deb10u3 \
         curl \
         npm=5.8.0+ds6-4+deb10u2 && \
-    pip3 install --no-cache-dir --upgrade pip==22.1.2 && \
-    npm install npm@latest -g && \
-    npm install -g serverless@3.24.1 && \
+    pip3 install --no-cache-dir --upgrade pip==23.3.1 && \
+    npm install npm@7.0 -g && \
+    npm install -g serverless@3.36.0 && \
     npm install -g serverless-compose@2.4.0 &&\
     apt-get -q -y clean && \
     rm -rf /var/cache/apt/archives/* /var/lib/apt/lists/*
 
 ARG APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1
-RUN curl -sL https://deb.nodesource.com/setup_14.x | bash
+RUN curl -sL https://deb.nodesource.com/setup_16.x | bash -
 RUN apt-get install -y nodejs
 
 WORKDIR /work
diff --git a/Makefile b/Makefile
index aa74f37..2ffb99f 100644
--- a/Makefile
+++ b/Makefile
@@ -32,6 +32,12 @@ build:
 		-t ${REPO}:3.10-${IMAGE_TAG} \
 		./3.10/.
 
+	# Python 3.11
+	docker build \
+		--build-arg base_image=python:3.11-slim \
+		-t ${REPO}:3.11-${IMAGE_TAG} \
+		./3.11/.
+
 push:
 	echo "Push specific tag/release"
 
@@ -48,4 +54,7 @@ push:
 	docker push ${REPO}:3.9-${IMAGE_TAG} 
 
 	# Python 3.10
-	docker push ${REPO}:3.10-${IMAGE_TAG} 
\ No newline at end of file
+	docker push ${REPO}:3.10-${IMAGE_TAG} 
+
+	# Python 3.11
+	docker push ${REPO}:3.11-${IMAGE_TAG} 
\ No newline at end of file