diff --git a/Dockerfile b/Dockerfile
index e7329a089b..530d41378d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM registry2.itci.conjur.net/cyberark/ubuntu-ruby-fips:20.04-b201fa9
+FROM cyberark/ubuntu-ruby-fips:2
 
 ENV DEBIAN_FRONTEND=noninteractive \
     PORT=80 \
diff --git a/Dockerfile.ubi b/Dockerfile.ubi
index 2f9d3b116e..6179baab8d 100644
--- a/Dockerfile.ubi
+++ b/Dockerfile.ubi
@@ -1,5 +1,5 @@
 # Conjur Base Image (UBI)
-FROM registry2.itci.conjur.net/cyberark/ubi-ruby-fips:ubi8-b201fa9
+FROM cyberark/ubi-ruby-fips:2
 
 EXPOSE 8080
 ARG VERSION
diff --git a/dev/Dockerfile.dev b/dev/Dockerfile.dev
index 611f669c22..ee2a1a5874 100644
--- a/dev/Dockerfile.dev
+++ b/dev/Dockerfile.dev
@@ -1,4 +1,4 @@
-FROM registry2.itci.conjur.net/cyberark/phusion-ruby-fips:0.11-b201fa9
+FROM cyberark/phusion-ruby-fips:2
 
 RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y \
     build-essential \
diff --git a/gems/policy-parser/Dockerfile.test b/gems/policy-parser/Dockerfile.test
index 0169c24edb..9570a99732 100644
--- a/gems/policy-parser/Dockerfile.test
+++ b/gems/policy-parser/Dockerfile.test
@@ -1,4 +1,4 @@
-FROM registry2.itci.conjur.net/cyberark/ubuntu-ruby-fips:20.04-b201fa9
+FROM cyberark/ubuntu-ruby-fips:2
 
 RUN mkdir /src
 WORKDIR /src
diff --git a/gems/policy-parser/docker-compose.yml b/gems/policy-parser/docker-compose.yml
index cc60db3207..7def1bf60b 100644
--- a/gems/policy-parser/docker-compose.yml
+++ b/gems/policy-parser/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "3"
 services:
   dev:
-    image: registry2.itci.conjur.net/cyberark/ubuntu-ruby-fips:20.04-b201fa9
+    image: cyberark/ubuntu-ruby-fips:2
     working_dir: /src
     volumes:
       - .:/src
diff --git a/package.sh b/package.sh
index 1c420d50e9..c4fc557836 100755
--- a/package.sh
+++ b/package.sh
@@ -8,7 +8,7 @@ chmod +x docker-debify
 docker run --rm \
   -v "$(pwd)":"$(pwd)" \
   --workdir "$(pwd)" \
-  registry2.itci.conjur.net/cyberark/phusion-ruby-fips:0.11-b201fa9 \
+  cyberark/phusion-ruby-fips:2 \
   sh -c "apt-get update -y && apt-get install -y git && bundle lock --update=conjur-api"
 
 # Create possum deb