diff --git a/Dockerfile b/Dockerfile
index b846fb655..18ef4ec35 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,16 +15,11 @@ COPY  ./src/key-managment ./key-managment
 RUN dotnet publish $PROJECT_NAME/$PROJECT_NAME.csproj -c Release -o ./obj/Docker/publish
 
 # Build runtime image
-FROM mcr.microsoft.com/dotnet/core/aspnet:3.1-alpine AS release
+FROM mcr.microsoft.com/dotnet/core/aspnet:3.1-buster-slim AS release
 ARG PROJECT_NAME=decrypt-api
 ENV PROJECT_NAME_ENV=$PROJECT_NAME
-RUN addgroup dotnet && \
-    adduser -D -G dotnet -h /home/dotnet dotnet && \
-    apk --no-cache add ca-certificates wget && \
-    wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub && \
-    wget -q https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.30-r0/glibc-2.30-r0.apk && \
-    apk add glibc-2.30-r0.apk && \
-    apk del wget
+RUN groupadd dotnet && \
+    useradd dotnet -g dotnet --home /home/dotnet
 
 USER dotnet
 
diff --git a/src/crd-controller/crd-controller.csproj b/src/crd-controller/crd-controller.csproj
index a498075b9..1ae0d4325 100644
--- a/src/crd-controller/crd-controller.csproj
+++ b/src/crd-controller/crd-controller.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <Version>0.6.3.0</Version>
+    <Version>0.6.4.0</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/decrypt-api/decrypt-api.csproj b/src/decrypt-api/decrypt-api.csproj
index 2e6a9ecaf..53c45eb1e 100644
--- a/src/decrypt-api/decrypt-api.csproj
+++ b/src/decrypt-api/decrypt-api.csproj
@@ -3,7 +3,7 @@
     <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
   <PropertyGroup>
-    <Version>0.6.3.0</Version>
+    <Version>0.6.4.0</Version>
   </PropertyGroup>
   <ItemGroup>
     <Folder Include="Models\" />
diff --git a/src/encrypt-api/encrypt-api.csproj b/src/encrypt-api/encrypt-api.csproj
index f4eab2385..59caebcb2 100644
--- a/src/encrypt-api/encrypt-api.csproj
+++ b/src/encrypt-api/encrypt-api.csproj
@@ -3,7 +3,7 @@
     <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
   <PropertyGroup>
-    <Version>0.6.3.0</Version>
+    <Version>0.6.4.0</Version>
   </PropertyGroup>
   <ItemGroup>
     <Folder Include="Models\" />