diff --git a/.pipelines/ci.yml b/.pipelines/ci.yml
index e82f029006d..e5964156ce0 100644
--- a/.pipelines/ci.yml
+++ b/.pipelines/ci.yml
@@ -82,12 +82,6 @@ jobs:
         displayName: 🧪 Run Golang unit tests
         target: golang
 
-      - script: |
-          set -xe
-          make validate-fips
-        displayName: 🕵️ Validate FIPS
-        target: golang
-
       - task: PublishTestResults@2
         displayName: 📊 Publish tests results
         inputs:
diff --git a/Dockerfile.aro-multistage b/Dockerfile.aro-multistage
index 80720d76385..07d58495b0a 100644
--- a/Dockerfile.aro-multistage
+++ b/Dockerfile.aro-multistage
@@ -7,7 +7,7 @@ ENV GOOS=linux \
 WORKDIR ${GOPATH}/src/github.com/Azure/ARO-RP
 USER root
 COPY . ${GOPATH}/src/github.com/Azure/ARO-RP/
-RUN make aro RELEASE=${IS_OFFICIAL_RELEASE} -o generate && make e2e.test
+RUN make aro RELEASE=${IS_OFFICIAL_RELEASE} -o generate && make validate-fips && make e2e.test
 
 FROM ${REGISTRY}/ubi8/ubi-minimal
 RUN microdnf update && microdnf clean all