diff --git a/Dockerfile b/Dockerfile
index c1e0e09935..e76282ded7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM cyberark/ubuntu-ruby-fips:1.0.4
+FROM cyberark/ubuntu-ruby-fips:latest
 
 ENV DEBIAN_FRONTEND=noninteractive \
     PORT=80 \
diff --git a/Dockerfile.ubi b/Dockerfile.ubi
index 51bb0aa694..8c054bed4b 100644
--- a/Dockerfile.ubi
+++ b/Dockerfile.ubi
@@ -1,5 +1,5 @@
 # Conjur Base Image (UBI)
-FROM cyberark/ubi-ruby-fips:1.0.4
+FROM cyberark/ubi-ruby-fips:latest
 
 EXPOSE 8080
 ARG VERSION
diff --git a/gems/policy-parser/docker-compose.yml b/gems/policy-parser/docker-compose.yml
index ee642f642c..3db4dba58f 100644
--- a/gems/policy-parser/docker-compose.yml
+++ b/gems/policy-parser/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "3"
 services:
   dev:
-    image: cyberark/ubuntu-ruby-fips:20.04-latest
+    image: cyberark/ubuntu-ruby-fips:latest
     working_dir: /src
     volumes:
       - .:/src