diff --git a/Dockerfile b/Dockerfile
index 3ff169c99b75c714a1412fbfa127d943f0d60e01..9e344cc9a5a970ece16445a66f50e416c48628e7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,28 +1,22 @@
-###############################################################
-# 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-1.6/istioctl-1.6/istioctl:1.6.1 AS base
+
+FROM istio/istioctl:1.6.1 AS base
 
 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
-###############################################################
-# Provide label information
-LABEL name="istio-istioctl" \
-      maintainer="cody.hutchins@darkwolf.co" \
-      vendor="Open Source" \
-      version="1.6.1" \
-      release="1" \
-      summary="Istio configuration command line utility" \
-      description="Istio configuration command line utility for service operators to debug and diagnose their Istio mesh."
-###############################################################
-# untar istioctl. Then copy the executable to /usr/local/bin
+
+LABEL org.opencontainers.image.title="istioctl" \
+      org.opencontainers.image.description="Istio configuration command line utility." \
+      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/istioctl /usr/local/bin/istioctl
 
-###############################################################
-# Run as another user, provide healthcheck, and set entrypoint
 USER 1000
+
 HEALTHCHECK --interval=1m --start-period=30s CMD version --remote=false
-ENTRYPOINT ["/usr/local/bin/istioctl"]
\ No newline at end of file
+
+ENTRYPOINT ["/usr/local/bin/istioctl"]
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/README.md b/README.md
index b6b23303555c41d920c9dba4ae7b282ec897a19d..bb9bdf89d232ea21ac601108036877ba66109ca7 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,4 @@
 # istioctl
-Version 1.6.1
 
 istioctl allows you to install and configure an Istio mesh for production use or for evaluation purposes. istioctl is a command line tool which provides customization of the Istio control plane and of the sidecars for the Istio data plane. It has user input validation to help prevent installation errors and customization options to override any aspect of the configuration.
 
diff --git a/download.yaml b/download.yaml
index 92aa0e0599319fcdb74585b1c4c578bfb41a9b5a..f14096e347ce27c26bcee0d1c7ef7619097a430a 100644
--- a/download.yaml
+++ b/download.yaml
@@ -1,4 +1,4 @@
 ---
 resources:
   - url: "docker://docker.io/istio/istioctl@sha256:090478dfa99e1779f0a90a83587229afda16cacf21621ef126dee95507d2f3d4"
-    tag: "opensource/istio-1.6/istioctl-1.6/istioctl:1.6.1"
+    tag: "istio/istioctl:1.6.1"
diff --git a/renovate.json b/renovate.json
new file mode 100644
index 0000000000000000000000000000000000000000..8dc814edb0e239ab04aa776df77059ee9fc479fb
--- /dev/null
+++ b/renovate.json
@@ -0,0 +1,32 @@
+{
+  "assignees": ["@gavin.scallon"],
+  "baseBranches": ["development"],
+  "packageRules": [
+    {
+      "datasources": ["docker"],
+      "packageNames": ["istio/istioctl"],
+      "separateMinorPatch": true,
+      "minor": {
+        "enabled": false
+      }
+    }
+  ],
+  "regexManagers": [
+    {
+      "fileMatch": ["^Dockerfile$"],
+      "matchStrings": [
+        "version=\"(?<currentValue>.*?)\""
+      ],
+      "depNameTemplate": "istio/istioctl",
+      "datasourceTemplate": "docker"
+    },
+    {
+      "fileMatch": ["^Jenkinsfile$"],
+      "matchStrings": [
+        "version:\\s+\"(?<currentValue>.*?)\""
+      ],
+      "depNameTemplate": "istio/istioctl",
+      "datasourceTemplate": "docker"
+    }
+  ]
+}