diff --git a/bitnami/kubectl/1.11/debian-9/Dockerfile b/bitnami/kubectl/1.11/debian-9/Dockerfile
index c00c4f7f975b..a9f1eabcae19 100644
--- a/bitnami/kubectl/1.11/debian-9/Dockerfile
+++ b/bitnami/kubectl/1.11/debian-9/Dockerfile
@@ -13,7 +13,7 @@ LABEL maintainer "Bitnami <containers@bitnami.com>"
 
 COPY --from=buildenv /opt/bitnami/kubectl /opt/bitnami/kubectl
 ENV BITNAMI_APP_NAME="kubectl" \
-    BITNAMI_IMAGE_VERSION="1.11.6-debian-9-r3" \
+    BITNAMI_IMAGE_VERSION="1.11.6-debian-9-r4" \
     PATH="/opt/bitnami/kubectl/bin:$PATH"
 
 RUN chmod +x /opt/bitnami/kubectl/bin/kubectl
diff --git a/bitnami/kubectl/README.md b/bitnami/kubectl/README.md
index cd485d711169..f041d1bd057c 100644
--- a/bitnami/kubectl/README.md
+++ b/bitnami/kubectl/README.md
@@ -33,7 +33,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t
 * [`1.12-ol-7`, `1.12.4-ol-7-r5` (1.12/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-kubectl/blob/1.12.4-ol-7-r5/1.12/ol-7/Dockerfile)
 * [`1.12-debian-9`, `1.12.4-debian-9-r4`, `1.12`, `1.12.4`, `1.12.4-r4` (1.12/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-kubectl/blob/1.12.4-debian-9-r4/1.12/debian-9/Dockerfile)
 * [`1.11-ol-7`, `1.11.6-ol-7-r3` (1.11/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-kubectl/blob/1.11.6-ol-7-r3/1.11/ol-7/Dockerfile)
-* [`1.11-debian-9`, `1.11.6-debian-9-r3`, `1.11`, `1.11.6`, `1.11.6-r3` (1.11/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-kubectl/blob/1.11.6-debian-9-r3/1.11/debian-9/Dockerfile)
+* [`1.11-debian-9`, `1.11.6-debian-9-r4`, `1.11`, `1.11.6`, `1.11.6-r4` (1.11/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-kubectl/blob/1.11.6-debian-9-r4/1.11/debian-9/Dockerfile)
 * [`1.10-ol-7`, `1.10.12-ol-7-r2` (1.10/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-kubectl/blob/1.10.12-ol-7-r2/1.10/ol-7/Dockerfile)
 * [`1.10-debian-9`, `1.10.12-debian-9-r2`, `1.10`, `1.10.12`, `1.10.12-r2` (1.10/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-kubectl/blob/1.10.12-debian-9-r2/1.10/debian-9/Dockerfile)
 * [`1.9-ol-7`, `1.9.11-ol-7-r3` (1.9/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-kubectl/blob/1.9.11-ol-7-r3/1.9/ol-7/Dockerfile)
diff --git a/bitnami/kubectl/circle.yml b/bitnami/kubectl/circle.yml
deleted file mode 100644
index 77d9d5bddd07..000000000000
--- a/bitnami/kubectl/circle.yml
+++ /dev/null
@@ -1,48 +0,0 @@
-version: 2
-jobs:
-  build:
-    working_directory: /workdir
-    docker:
-      - image: docker:17.06.0-ce-git
-        environment:
-          RELEASE_SERIES_LIST: "1.10,1.11,1.12,1.13,1.9"
-          LATEST_STABLE: "1.13"
-          DISTRIBUTIONS_LIST: "debian-9,ol-7"
-          IMAGE_NAME: kubectl
-          DOCKER_PROJECT: bitnami
-          QUAY_PROJECT: bitnami
-          GCLOUD_PROJECT: bitnami-containers
-          AZURE_PROJECT: bitnami
-
-    steps:
-      - checkout
-      - setup_remote_docker:
-          version: 17.06.0-ce
-      - run:
-          name: Upgrade system packages (workaround - https://github.com/docker-library/docker/issues/72)
-          command: |
-            apk upgrade --no-cache
-      - run:
-          name: Install dependencies
-          command: |
-            apk add --no-cache curl bash coreutils
-      - run:
-          name: Docker info
-          command: |
-            docker version
-            docker info
-      - deploy:
-          name: Publish docker image
-          command: |
-            if [ -n "${CIRCLE_TAG}" ]; then
-              curl -sL https://raw.githubusercontent.com/bitnami/test-infra/master/circle/docker-release-image.sh | bash -
-            fi
-
-workflows:
-  version: 2
-  build-and-deploy:
-    jobs:
-      - build:
-          filters:
-            tags:
-              only: /^.*(?<!-rhel-7)-r[0-9]+$/