diff --git a/Dockerfile b/Dockerfile
index 8fa15894f81d6b3b2aca5f7f58d795835f29875c..5620f090d06e21b8f15d0a71b3bed989f081ca51 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,12 +2,11 @@ ARG BASE_REGISTRY=registry1.dsop.io
 ARG BASE_IMAGE=ironbank/redhat/openjdk/openjdk11
 ARG BASE_TAG=1.11
 
-FROM sonarqube:8.5-community AS build
+FROM sonarqube:8.6-community AS build
 
 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
 
-
-ARG SONARQUBE_VERSION="8.5-community"
+ARG SONARQUBE_VERSION="8.6-community"
 ENV SONAR_VERSION="${SONARQUBE_VERSION}" \
     SONARQUBE_HOME="/opt/sonarqube" \
     SQ_DATA_DIR="/opt/sonarqube/data" \
diff --git a/Kptfile b/Kptfile
index 4987f30305c0b089cd054936f14f4556afc53f0d..b10b47ae78c96b48527ef776f8e40ca6bd20a4cc 100644
--- a/Kptfile
+++ b/Kptfile
@@ -9,5 +9,5 @@ dependencies:
     git:
         repo: https://github.com/SonarSource/docker-sonarqube
         directory: /8/community
-        ref: 8.5.1
+        ref: 8.6
     updateStrategy: resource-merge
diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml
index 8223f53a61f78a16bbad095ec44cb95fba030a54..0e3eb4a7ffcd48cc416e8f8b2ffb18cde610f52a 100644
--- a/hardening_manifest.yaml
+++ b/hardening_manifest.yaml
@@ -8,7 +8,7 @@ name: "sonarsource/sonarqube/sonarqube8-community"
 # The most specific version should be the first tag and will be shown
 # on ironbank.dsop.io
 tags:
-- "8.5-community"
+- "8.6-community"
 - "latest"
 
 # Build args passed to Dockerfile ARGs
@@ -27,29 +27,24 @@ labels:
   org.opencontainers.image.url: "https://docs.sonarqube.org/latest/"
   ## Name of the distributing entity, organization or individual
   org.opencontainers.image.vendor: "SonarSource SA"
-  org.opencontainers.image.version: "8.5-community"
+  org.opencontainers.image.version: "8.6-community"
   ## Keywords to help with search (ex. "cicd,gitops,golang")
   mil.dso.ironbank.image.keywords: "cicd,devops,sast,review"
   ## This value can be "opensource" or "commercial"
   mil.dso.ironbank.image.type: "opensource"
   ## Product the image belongs to for grouping multiple images
-  mil.dso.ironbank.product.name: "sonarqube"
+  mil.dso.ironbank.product.name: "SonarQube"
 
 # List of resources to make available to the offline build context
 resources:
-- tag: sonarqube:8.5-community
-  url: docker://docker.io/library/sonarqube@sha256:3444998c3219ea0490ed583b536ff9ba5031920603442680f5123b0628506d28
+- url: docker://docker.io/library/sonarqube@sha256:993b79a45e985a36046327759ecc76d711dfde123ed11944d32a3282d66758cb
+  tag: sonarqube:8.6-community
 
 # List of project maintainers
-# FIXME: Fill in the following details for the current container owner in the whitelist
-# FIXME: Include any other vendor information if applicable
 maintainers:
-    - email: "melissari_sean@bah.com"
-#   # The name of the current container owner
-      name: "Sean Melissari"
-#   # The gitlab username of the current container owner
-      username: "sean.melissari"
-      cht_member: true # FIXME: Uncomment if the maintainer is a member of CHT
-#  - name: "FIXME"
-#   username: "FIXME"
-#   email: "FIXME"
+- name: "Tobias Trabelsi"
+  username: "ttrabelsi"
+- name: "Sean Melissari"
+  username: "sean.melissari"
+  email: "melissari_sean@bah.com"
+  cht_member: true
diff --git a/scripts/Kptfile b/scripts/Kptfile
index b8e3ac9a3c017e9cd3c656d0e668678eed678b67..db75fc51c7bede1ed3a81c19a8c101c036aec24b 100644
--- a/scripts/Kptfile
+++ b/scripts/Kptfile
@@ -5,10 +5,10 @@ metadata:
 upstream:
     type: git
     git:
-        commit: 080756681fa616580101c685dd08f6cb0d328bb6
+        commit: cccf2b692431e2eca2bb77ab9ae749b2b54ddf6a
         repo: https://github.com/SonarSource/docker-sonarqube
         directory: /8/community
-        ref: 8.5.1
+        ref: "8.6"
 packageMetadata:
     shortDescription: vendor scripts sync
 dependencies:
@@ -16,5 +16,5 @@ dependencies:
     git:
         repo: https://github.com/SonarSource/docker-sonarqube
         directory: /8/community
-        ref: 8.5.1
+        ref: "8.6"
     updateStrategy: resource-merge