diff --git a/Dockerfile b/Dockerfile
index 4aa16c5c65b271a05f376ebde4157efbb8b2aa96..13ca354d3ebb6b05429877c36ce157eac7e33010 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,12 +1,12 @@
-ARG BASE_REGISTRY=registry1.dsop.io
+ARG BASE_REGISTRY=registry1.dso.mil
 ARG BASE_IMAGE=ironbank/redhat/openjdk/openjdk11
 ARG BASE_TAG=1.11
 
-FROM sonarqube:8.6-developer AS build
+FROM sonarqube:8.7.1-developer AS build
 
 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
 
-ARG SONARQUBE_VERSION="8.6-developer"
+ARG SONARQUBE_VERSION="8.7-developer"
 ENV SONAR_VERSION="${SONARQUBE_VERSION}" \
     SONARQUBE_HOME="/opt/sonarqube" \
     SQ_DATA_DIR="/opt/sonarqube/data" \
diff --git a/Kptfile b/Kptfile
index 9fc9bfc8b1d1c08604c39a6beba56336509992ef..4edd4d8935273a70e2b38f4fe70b91dcdf194aed 100644
--- a/Kptfile
+++ b/Kptfile
@@ -9,5 +9,5 @@ dependencies:
     git:
         repo: https://github.com/SonarSource/docker-sonarqube
         directory: /8/developer
-        ref: 8.6
+        ref: 8.7.1
     updateStrategy: resource-merge
diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml
index 34ee240c1c6b67cf51f1aca14af156ea583fe4fa..eaf61ec903c510d439c73d6cceb67f576642385b 100644
--- a/hardening_manifest.yaml
+++ b/hardening_manifest.yaml
@@ -8,7 +8,7 @@ name: "sonarsource/sonarqube/sonarqube8-developer"
 # The most specific version should be the first tag and will be shown
 # on ironbank.dsop.io
 tags:
-- "8.6-developer"
+- "8.7.1-developer"
 - "latest"
 
 # Build args passed to Dockerfile ARGs
@@ -27,7 +27,7 @@ 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.6-developer"
+  org.opencontainers.image.version: "8.7.1-developer"
   ## 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"
@@ -37,8 +37,8 @@ labels:
 
 # List of resources to make available to the offline build context
 resources:
-- url: "docker://docker.io/library/sonarqube@sha256:9c16eae47d0d8c42edc97672e242f82aae6ab2a27854fcb625951695a03fca1a"
-  tag: "sonarqube:8.6-developer"
+- url: "docker://docker.io/library/sonarqube@sha256:008607eec24e44db50a7223df8ea3ac916b498bb39fe51da0c1f6b15a8d63708"
+  tag: "sonarqube:8.7.1-developer"
 
 # List of project maintainers
 maintainers:
diff --git a/scripts/Kptfile b/scripts/Kptfile
index da75db5f935935f16ee1e7e0a8d88bb4d7d44982..0b4ee780ef2f57fd9e22446024b0ad461750333b 100644
--- a/scripts/Kptfile
+++ b/scripts/Kptfile
@@ -5,10 +5,10 @@ metadata:
 upstream:
     type: git
     git:
-        commit: cccf2b692431e2eca2bb77ab9ae749b2b54ddf6a
+        commit: 277ec116b3df9556f975b7af328c053316bb2c2d
         repo: https://github.com/SonarSource/docker-sonarqube
         directory: /8/developer
-        ref: "8.6"
+        ref: 8.7.1
 packageMetadata:
     shortDescription: vendor scripts sync
 dependencies: