diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9de6dff7..4b245d5f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -8,6 +8,8 @@ on:
       - 'docs/**'
       - 'examples/**'
       - '**.md'
+    tags:
+      - 'v[0-9]+.[0-9]+.[0-9]+'
   pull_request:
     branches:
       - master
@@ -19,9 +21,6 @@ on:
       - 'docs/**'
       - 'examples/**'
       - '**.md'
-  create:
-    tags:
-      - 'v[0-9]+.[0-9]+.[0-9]+*'
 
 env:
   DOCKER_BUILDKIT: 1
@@ -38,7 +37,6 @@ jobs:
     outputs:
       sha_short: ${{ steps.vars.outputs.sha }}
       go_version: ${{ steps.vars.outputs.go_version }}
-      git_tag: ${{ steps.vars.outputs.git_tag }}
       repo_name: ${{ steps.vars.outputs.repo }}
     steps:
       - name: Checkout Repository
@@ -48,7 +46,6 @@ jobs:
         run: |
           echo "::set-output name=sha::$(echo ${GITHUB_SHA} | cut -c1-7)"
           echo "::set-output name=go_version::$(grep "go 1." go.mod | cut -d " " -f 2)"
-          echo "::set-output name=git_tag::$(echo ${GITHUB_REF/refs\/tags\//} | tr -d v)"
           echo "::set-output name=repo::$(echo ${GITHUB_REPOSITORY} | cut -d '/' -f 2)"
 
   binary:
@@ -96,23 +93,43 @@ jobs:
         with:
           path: ${{ github.workspace }}/bin/manager
           key: nginx-ingress-operator-${{ github.run_id }}-${{ github.run_number }}
+      - name: DockerHub Login
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+        if: github.event_name != 'pull_request'
       - name: Docker Buildx
         uses: docker/setup-buildx-action@v1
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v3
+        with:
+          images: |
+            nginx/nginx-ingress-operator
+          tags: |
+            type=edge
+            type=ref,event=pr
+            type=semver,pattern={{version}}
+          labels: |
+            org.opencontainers.image.documentation=https://docs.nginx.com/nginx-ingress-controller
+            org.opencontainers.image.vendor=NGINX Inc <kubernetes@nginx.com>
       - name: Build Image
         uses: docker/build-push-action@v2
         with:
           context: '.'
           cache-from: type=gha
           cache-to: type=gha,mode=max
-          tags: nginx/nginx-ingress-operator:${{ github.sha }}
-          push: false
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          load: ${{ github.event_name == 'pull_request' }}
+          push: ${{ github.event_name != 'pull_request' }}
           pull: true
-          load: true
       - name: Run Trivy vulnerability scanner
         uses: aquasecurity/trivy-action@0.2.1
         continue-on-error: true
         with:
-          image-ref: nginx/nginx-ingress-operator:${{ github.sha }}
+          image-ref: nginx/nginx-ingress-operator:${{ steps.meta.outputs.version }}
           format: 'template'
           template: '@/contrib/sarif.tpl'
           output: 'trivy-results.sarif'
@@ -121,7 +138,7 @@ jobs:
         uses: github/codeql-action/upload-sarif@v1
         continue-on-error: true
         with:
-          sarif_file: 'trivy-result.sarif'
+          sarif_file: 'trivy-results.sarif'
       - name: Upload Scan Results
         uses: actions/upload-artifact@v2
         continue-on-error: true
@@ -130,46 +147,11 @@ jobs:
           path: 'trivy-results.sarif'
         if: always()
 
-  release-docker:
-    name: Release Image
-    runs-on: ubuntu-20.04
-    needs: [vars, build, unit-tests]
-    if:
-      github.repository == 'nginxinc/nginx-ingress-operator' &&
-      github.event_name == 'create' &&
-      contains(github.ref, 'refs/tags/')
-    steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v2
-      - name: Fetch Cached Artifacts
-        uses: actions/cache@v2
-        with:
-          path: ${{ github.workspace }}/build/_output/bin/nginx-ingress-operator
-          key: nginx-ingress-operator-${{ github.run_id }}-${{ github.run_number }}
-      - name: Docker Buildx
-        uses: docker/setup-buildx-action@v1
-      - name: DockerHub Login
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-      - name: Push to Dockerhub
-        uses: docker/build-push-action@v2
-        with:
-          file: Dockerfile
-          context: '.'
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-          tags: |
-            nginx/nginx-ingress-operator:latest
-            nginx/nginx-ingress-operator:${{ needs.vars.outputs.git_tag }}
-          push: true
-          pull: true
 
   notify:
     name: Notify
     runs-on: ubuntu-20.04
-    needs: [vars, release-docker]
+    needs: [vars, build]
     if: always() && github.ref == 'refs/heads/master'
     steps:
       - name: Workflow Status
diff --git a/Dockerfile b/Dockerfile
index 1a92752b..1795cd13 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,12 +18,20 @@ COPY controllers/ controllers/
 # Build
 RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags "-s -w -X main.version=${VERSION}" -a -o manager main.go
 
-# Use distroless as minimal base image to package the manager binary
-# Refer to https://github.com/GoogleContainerTools/distroless for more details
-FROM gcr.io/distroless/static:nonroot
+FROM registry.access.redhat.com/ubi8/ubi-minimal:latest
+ARG VERSION
 WORKDIR /
-COPY --from=builder --chown=65532:65532 /workspace/manager .
+COPY --from=builder /workspace/manager .
 COPY config/crd/kic ./config/crd/kic
-USER 65532:65532
+COPY LICENSE /licenses/
+
+LABEL name="NGINX Ingress Operator" \
+      vendor="NGINX Inc <kubernetes@nginx.com" \
+      version="v${VERSION}" \
+      release="1" \
+      summary="The NGINX Ingress Operator is a Kubernetes/OpenShift component which deploys and manages one or more NGINX/NGINX Plus Ingress Controllers" \
+      description="The NGINX Ingress Operator is a Kubernetes/OpenShift component which deploys and manages one or more NGINX/NGINX Plus Ingress Controllers"
 
 ENTRYPOINT ["/manager"]
+
+USER 1001
diff --git a/Makefile b/Makefile
index 9da4a80e..0efb8ef0 100644
--- a/Makefile
+++ b/Makefile
@@ -41,9 +41,7 @@ IMG ?= $(IMAGE_TAG_BASE):$(VERSION)
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
 ENVTEST_K8S_VERSION = 1.22
 
-# Change DOCKERFILE tp openshift.Dockerfile to build Openshift image
 DOCKERFILE ?= Dockerfile
-RH_RBAC_IMAGE ?= registry.redhat.io/openshift4/ose-kube-rbac-proxy:v4.7
 
 # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
 ifeq (,$(shell go env GOBIN))
@@ -125,11 +123,6 @@ deploy: manifests kustomize ## Deploy controller to the K8s cluster specified in
 	cd config/manager && $(KUSTOMIZE) edit set image controller=${IMG}
 	$(KUSTOMIZE) build config/default | kubectl apply -f -
 
-openshift-deploy: manifests kustomize ## Deploy controller to the K8s cluster specified in ~/.kube/config.
-	VAL="${RH_RBAC_IMAGE}" yq e '.spec.template.spec.containers[0].image = strenv(VAL)' -i config/default/manager_auth_proxy_patch.yaml
-	cd config/manager && $(KUSTOMIZE) edit set image controller=${IMG}
-	$(KUSTOMIZE) build config/default | kubectl apply -f -
-
 undeploy: ## Undeploy controller from the K8s cluster specified in ~/.kube/config.
 	$(KUSTOMIZE) build config/default | kubectl delete -f -
 
diff --git a/openshift.Dockerfile b/openshift.Dockerfile
deleted file mode 100644
index ec0e27e3..00000000
--- a/openshift.Dockerfile
+++ /dev/null
@@ -1,37 +0,0 @@
-# Build the manager binary
-FROM golang:1.16 as builder
-ARG VERSION
-
-WORKDIR /workspace
-# Copy the Go Modules manifests
-COPY go.mod go.mod
-COPY go.sum go.sum
-# cache deps before building and copying source so that we don't need to re-download as much
-# and so that source changes don't invalidate our downloaded layer
-RUN go mod download
-
-# Copy the go source
-COPY main.go main.go
-COPY api/ api/
-COPY controllers/ controllers/
-
-# Build
-RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags "-s -w -X main.version=${VERSION}" -a -o manager main.go
-
-FROM registry.access.redhat.com/ubi8/ubi-minimal:latest
-WORKDIR /
-COPY --from=builder /workspace/manager .
-COPY config/crd/kic ./config/crd/kic
-COPY LICENSE /licenses/
-
-# temporary fix for CVE-2021-42574
-RUN microdnf upgrade -y libgcc libstdc++
-
-LABEL name="NGINX Ingress Operator" \
-      description="The NGINX Ingress Operator is a Kubernetes/OpenShift component which deploys and manages one or more NGINX/NGINX Plus Ingress Controllers" \
-      summary="The NGINX Ingress Operator is a Kubernetes/OpenShift component which deploys and manages one or more NGINX/NGINX Plus Ingress Controllers" \
-      io.openshift.tags="nginx,ingress-controller,ingress,controller,kubernetes,openshift" \
-      maintainer="NGINX Inc <kubernetes@nginx.com>" \
-      vendor="NGINX Inc <kubernetes@nginx.com>"
-
-ENTRYPOINT ["/manager"]