diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 86ecf72ebf0..b77bf0700e0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -182,7 +182,7 @@ build-idp-image:
       --cache-repo="${ECR_REGISTRY}/identity-idp/idp/cache"
       --cache-ttl=168h
       --cache=true
-      --single-snapshot 
+      --snapshot-mode=redo
       --compressed-caching=false
       --build-arg "http_proxy=${http_proxy}"
       --build-arg "https_proxy=${https_proxy}"
diff --git a/dockerfiles/idp_prod.Dockerfile b/dockerfiles/idp_prod.Dockerfile
index fb784d70a8f..19139a0d362 100644
--- a/dockerfiles/idp_prod.Dockerfile
+++ b/dockerfiles/idp_prod.Dockerfile
@@ -104,7 +104,7 @@ COPY public/ban-robots.txt $RAILS_ROOT/public/robots.txt
 COPY ./config/application.yml.default.prod $RAILS_ROOT/config/application.yml
 
 # Precompile assets
-RUN bundle exec rake assets:precompile --trace
+RUN bundle exec rake assets:precompile --trace && rm -r node_modules/ && rm -r .yarn-cache/
 
 # get service_providers.yml and related files
 ARG SERVICE_PROVIDERS_KEY
@@ -136,7 +136,7 @@ RUN openssl req -x509 -sha256 -nodes -newkey rsa:2048 -days 1825 \
 #########################################################################
 # This is the main image.
 #########################################################################
-FROM ruby:3.3.4-slim
+FROM ruby:3.3.4-slim as main
 
 # Set environment variables
 ENV RAILS_ROOT /app
@@ -179,7 +179,6 @@ RUN apt-get update -qq && \
     libxml2-dev \
     libxslt1-dev \
     libcurl4-openssl-dev \
-    software-properties-common \
     libffi-dev \
     libpq-dev \
     unzip && \
diff --git a/dockerfiles/idp_prod.Dockerfile.dockerignore b/dockerfiles/idp_prod.Dockerfile.dockerignore
index a354b35767f..6e2afa4cbb8 100644
--- a/dockerfiles/idp_prod.Dockerfile.dockerignore
+++ b/dockerfiles/idp_prod.Dockerfile.dockerignore
@@ -1,2 +1,2 @@
 /app/node_modules
-
+/app/.yarn-cache