diff --git a/Dockerfile b/Dockerfile
index dfe181a75..f25bef109 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,17 @@
-FROM azul/zulu-openjdk-debian:14
+FROM debian:12
 
 ENV DEBIAN_FRONTEND noninteractive
 
+RUN apt-get update && \
+    apt-get install -y wget gnupg2 software-properties-common
+
+RUN wget -O- https://apt.corretto.aws/corretto.key | apt-key add -
+RUN add-apt-repository -y 'deb https://apt.corretto.aws stable main'
+# For some reason, needs to be run again for the repo to be usable
+RUN add-apt-repository -y 'deb https://apt.corretto.aws stable main'
+RUN apt-get update && \
+    apt-get install -y java-17-amazon-corretto-jdk
+
 RUN mkdir /usr/app/
 COPY . /user/app/ 
 WORKDIR /user/app/ 
diff --git a/grpc-gateway/Dockerfile b/grpc-gateway/Dockerfile
index f2412a487..2a7a8da17 100644
--- a/grpc-gateway/Dockerfile
+++ b/grpc-gateway/Dockerfile
@@ -1,9 +1,17 @@
-FROM azul/zulu-openjdk-debian:14
+FROM debian:12
 
 RUN apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y wget unzip htop \
     golang-go \
-    git
+    git \
+    gnupg2 software-properties-common
+
+RUN wget -O- https://apt.corretto.aws/corretto.key | apt-key add -
+RUN add-apt-repository -y 'deb https://apt.corretto.aws stable main'
+# For some reason, needs to be run again for the repo to be usable
+RUN add-apt-repository -y 'deb https://apt.corretto.aws stable main'
+RUN apt-get update && \
+    DEBIAN_FRONTEND=noninteractive apt-get install -y java-17-amazon-corretto-jdk
 
 # Install protoc
 ENV PROTOC_VERSION=3.11.4
@@ -45,6 +53,11 @@ RUN go get \
     github.com/golang/protobuf/protoc-gen-go@v${PROTOC_GEN_GO_VERSION} \
     google.golang.org/grpc@v${GRPC_VERSION}
 
+RUN go install \
+    github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway@v${GRPC_GATEWAY_VERSION} \
+    github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger@v${GRPC_GATEWAY_VERSION}
+RUN go install github.com/golang/protobuf/protoc-gen-go@v${PROTOC_GEN_GO_VERSION}
+
 ENV PROTO_PATH=/code/clientlib/src/main/proto
 ENV PROTO_BUILD_PATH=/code/clientlib/build