diff --git a/Dockerfile b/Dockerfile
index bac7ee31be277a84c724a0b0331608492619d5e0..96ccc52ef6fbd0496a88951dd5ef539d2179660a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,28 +1,23 @@
-###############################################################
-# Default registry variables
 ARG BASE_REGISTRY=nexus-docker-secure.levelup-dev.io
 ARG BASE_IMAGE=redhat/ubi/ubi8
 ARG BASE_TAG=8.2
-###############################################################
-# Copy mixer contents to base image
-FROM opensource/istio/mixer/mixer:1.6.1 AS base
+
+FROM istio/mixer:1.6.1 AS base
 
 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
 
+LABEL org.opencontainers.image.title="mixer" \
+      org.opencontainers.image.description="Mixer provides policy controls and telemetry collection." \
+      org.opencontainers.image.licenses="Apache-2.0" \
+      org.opencontainers.image.url="https://istio.io" \
+      org.opencontainers.image.version="1.6.1" \
+      maintainer="cht@dsop.io"
+
 COPY --from=base /usr/local/bin/mixs /usr/local/bin/mixs
-###############################################################
-# Provide label information
-LABEL name="istio-mixer" \
-      maintainer="gavin.scallon@parsons.com" \
-      vendor="Open Source" \
-      version="1.6.1" \
-      release="1" \
-      summary="Mixer provides policy controls and telemetry collection" \
-      description="Provides backend abstraction and intermediation"
 
-###############################################################
-# Run as non-root user, provide healthcheck and entrypoint/cmd
-ENTRYPOINT ["/usr/local/bin/mixs", "server"]
 USER 1001
+
 HEALTHCHECK --interval=1m --start-period=30s CMD mixs server --help
-CMD [ "--configStoreURL=fs:///etc/opt/mixer/configroot","--configStoreURL=k8s://" ]
\ No newline at end of file
+
+ENTRYPOINT ["/usr/local/bin/mixs", "server"]
+CMD [ "--configStoreURL=fs:///etc/opt/mixer/configroot","--configStoreURL=k8s://" ]
diff --git a/Jenkinsfile b/Jenkinsfile
index c536db007cdd4fe920d2158a2fe1a3866b75d6ba..8916a8470a265a0baf5e5092bc6cafe105e5b048 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,2 +1,2 @@
 @Library('DCCSCR@master') _
-dccscrPipeline( version: "1.6.1")
\ No newline at end of file
+dccscrPipeline(version: "1.6.1")
diff --git a/download.yaml b/download.yaml
index 49d8d36a4f81c06f0b7ed063a20f7c58bee62266..fabb38d1d1415c4826600a05fdba7b5c7f0656f5 100644
--- a/download.yaml
+++ b/download.yaml
@@ -1,4 +1,4 @@
 ---
 resources:
   - url: "docker://docker.io/istio/mixer@sha256:c5c5d32773b3c6f39ca24420528213a3f084e39d013bbeb21fad1d7454aa2af0"
-    tag: "opensource/istio/mixer/mixer:1.6.1"
+    tag: "istio/mixer:1.6.1"
diff --git a/renovate.json b/renovate.json
new file mode 100644
index 0000000000000000000000000000000000000000..031f440d209c83df036138b4678c7cc4a796392c
--- /dev/null
+++ b/renovate.json
@@ -0,0 +1,32 @@
+{
+  "assignees": ["@gavin.scallon"],
+  "baseBranches": ["development"],
+  "packageRules": [
+    {
+      "datasources": ["docker"],
+      "packageNames": ["istio/mixer"],
+      "separateMinorPatch": true,
+      "minor": {
+        "enabled": false
+      }
+    }
+  ],
+  "regexManagers": [
+    {
+      "fileMatch": ["^Dockerfile$"],
+      "matchStrings": [
+        "version=\"(?<currentValue>.*?)\""
+      ],
+      "depNameTemplate": "istio/mixer",
+      "datasourceTemplate": "docker"
+    },
+    {
+      "fileMatch": ["^Jenkinsfile$"],
+      "matchStrings": [
+        "version:\\s+\"(?<currentValue>.*?)\""
+      ],
+      "depNameTemplate": "istio/mixer",
+      "datasourceTemplate": "docker"
+    }
+  ]
+}