diff --git a/Dockerfile b/Dockerfile
index 260b42ae74437f4c76407803e354f15eab56feea..1f75ba5e210decac813d68b5d2d9fc482b9b48e7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 ARG BASE_REGISTRY=registry1.dso.mil
 ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8
-ARG BASE_TAG=8.3
+ARG BASE_TAG=8.4
 
 FROM openpolicyagent/proxy_init:v5 as base
 
diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml
index 5c0db20bdd738bd5f2b5085d7598945f6b3d1995..9ed92e05cc2d401af65107098ea3827ccbd75c39 100644
--- a/hardening_manifest.yaml
+++ b/hardening_manifest.yaml
@@ -14,7 +14,7 @@ tags:
 # Build args passed to Dockerfile ARGs
 args:
   BASE_IMAGE: "redhat/ubi/ubi8"
-  BASE_TAG: "8.3"
+  BASE_TAG: "8.4"
 
 # Docker image labels
 labels:
diff --git a/renovate.json b/renovate.json
index a8436f5eb13717ba3c1136c892c60cf9f628c773..0fe04f68f4b6ab0ff4a4d2508a221fea6e7a69ff 100644
--- a/renovate.json
+++ b/renovate.json
@@ -5,17 +5,9 @@
   "baseBranches": [
     "development"
   ],
+  "automerge": true,
+  "gitLabAutomerge": true,
   "regexManagers": [
-    {
-      "fileMatch": [
-        "^Dockerfile$"
-      ],
-      "matchStrings": [
-        "version=\"(?<currentValue>.*?)\""
-      ],
-      "depNameTemplate": "openpolicyagent/proxy_init",
-      "datasourceTemplate": "docker"
-    },
     {
       "fileMatch": [
         "^hardening_manifest.yaml$"
@@ -37,4 +29,4 @@
       "datasourceTemplate": "docker"
     }
   ]
-}
\ No newline at end of file
+}