Test build for #1757

SUSE · Sep 27, 2024 · 9923268 · 9923268
1 parent 1216715
commit 9923268
Show file tree

Hide file tree

Showing 43 changed files with 156 additions and 156 deletions.
diff --git a/389-ds-container/Dockerfile b/389-ds-container/Dockerfile
@@ -15,9 +15,9 @@
 
 #!UseOBSRepositories
 
-#!BuildTag: opensuse/389-ds:%%389ds_version%%
-#!BuildTag: opensuse/389-ds:%%389ds_version%%-%RELEASE%
-#!BuildTag: opensuse/389-ds:latest
+#!BuildTag: opensuse/bci/389-ds:%%389ds_version%%
+#!BuildTag: opensuse/bci/389-ds:%%389ds_version%%-%RELEASE%
+#!BuildTag: opensuse/bci/389-ds:latest
 
 FROM opensuse/tumbleweed:latest
 
@@ -37,7 +37,7 @@ LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="openSUSE Project"
 LABEL org.opencontainers.image.source="%SOURCEURL%"
 LABEL org.opencontainers.image.ref.name="%%389ds_version%%-%RELEASE%"
-LABEL org.opensuse.reference="registry.opensuse.org/opensuse/389-ds:%%389ds_version%%-%RELEASE%"
+LABEL org.opensuse.reference="registry.opensuse.org/opensuse/bci/389-ds:%%389ds_version%%-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL org.opensuse.lifecycle-url="https://en.opensuse.org/Lifetime#openSUSE_BCI"
 LABEL org.opensuse.release-stage="released"

diff --git a/389-ds-container/README.md b/389-ds-container/README.md
@@ -13,7 +13,7 @@ is also included a pre-configured Name Service Switch (NSS) configuration
 file (`/etc/nsswitch.conf`).
 
 ```ShellSession
-$ podman run -it --rm -p 3389:3389 -p 3636:3636 registry.opensuse.org/opensuse/389-ds:%%389ds_version%%
+$ podman run -it --rm -p 3389:3389 -p 3636:3636 registry.opensuse.org/opensuse/bci/389-ds:%%389ds_version%%
 ```
 
 ## Volumes
@@ -26,7 +26,7 @@ To mount a host directory as a volume for your database, run the following
 command:
 
 ```ShellSession
-$ podman run -it --rm -v /my/own/datadir:/data:Z -p 3389:3389 -p 3636:3636 registry.opensuse.org/opensuse/389-ds:%%389ds_version%%
+$ podman run -it --rm -v /my/own/datadir:/data:Z -p 3389:3389 -p 3636:3636 registry.opensuse.org/opensuse/bci/389-ds:%%389ds_version%%
 ```
 
 ## Certificates

diff --git a/alertmanager-image/Dockerfile b/alertmanager-image/Dockerfile
@@ -15,10 +15,10 @@
 
 #!UseOBSRepositories
 
-#!BuildTag: opensuse/alertmanager:%%alertmanager_patch_version%%
-#!BuildTag: opensuse/alertmanager:%%alertmanager_patch_version%%-%RELEASE%
-#!BuildTag: opensuse/alertmanager:%%alertmanager_minor_version%%
-#!BuildTag: opensuse/alertmanager:latest
+#!BuildTag: opensuse/bci/alertmanager:%%alertmanager_patch_version%%
+#!BuildTag: opensuse/bci/alertmanager:%%alertmanager_patch_version%%-%RELEASE%
+#!BuildTag: opensuse/bci/alertmanager:%%alertmanager_minor_version%%
+#!BuildTag: opensuse/bci/alertmanager:latest
 
 FROM opensuse/tumbleweed:latest
 
@@ -38,7 +38,7 @@ LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="openSUSE Project"
 LABEL org.opencontainers.image.source="%SOURCEURL%"
 LABEL org.opencontainers.image.ref.name="%%alertmanager_patch_version%%-%RELEASE%"
-LABEL org.opensuse.reference="registry.opensuse.org/opensuse/alertmanager:%%alertmanager_patch_version%%-%RELEASE%"
+LABEL org.opensuse.reference="registry.opensuse.org/opensuse/bci/alertmanager:%%alertmanager_patch_version%%-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL org.opensuse.lifecycle-url="https://en.opensuse.org/Lifetime#openSUSE_BCI"
 LABEL org.opensuse.release-stage="released"

diff --git a/apache-tomcat-10-java-17-image/Dockerfile b/apache-tomcat-10-java-17-image/Dockerfile
@@ -15,9 +15,9 @@
 
 #!UseOBSRepositories
 
-#!BuildTag: opensuse/apache-tomcat:10.1-openjdk17
-#!BuildTag: opensuse/apache-tomcat:10.1-openjdk17-%RELEASE%
-#!BuildTag: opensuse/apache-tomcat:%%tomcat_version%%-openjdk17
+#!BuildTag: opensuse/bci/apache-tomcat:10.1-openjdk17
+#!BuildTag: opensuse/bci/apache-tomcat:10.1-openjdk17-%RELEASE%
+#!BuildTag: opensuse/bci/apache-tomcat:%%tomcat_version%%-openjdk17
 
 FROM opensuse/bci/bci-micro:latest AS target
 FROM opensuse/tumbleweed:latest AS builder
@@ -41,7 +41,7 @@ LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="openSUSE Project"
 LABEL org.opencontainers.image.source="%SOURCEURL%"
 LABEL org.opencontainers.image.ref.name="10.1-openjdk17-%RELEASE%"
-LABEL org.opensuse.reference="registry.opensuse.org/opensuse/apache-tomcat:10.1-openjdk17-%RELEASE%"
+LABEL org.opensuse.reference="registry.opensuse.org/opensuse/bci/apache-tomcat:10.1-openjdk17-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL org.opensuse.lifecycle-url="https://en.opensuse.org/Lifetime#openSUSE_BCI"
 LABEL org.opensuse.release-stage="released"

diff --git a/apache-tomcat-10-java-17-image/README.md b/apache-tomcat-10-java-17-image/README.md
@@ -21,7 +21,7 @@ To deploy an application, copy the `.war` file into
 `$CATALINA_BASE/webapps` (either during a container build or by bind-mounting
 the directory), and launch the container using the following command:
 ```ShellSession
-$ podman run -d --rm -p 8080:8080 registry.opensuse.org/opensuse/apache-tomcat:10.1-openjdk17
+$ podman run -d --rm -p 8080:8080 registry.opensuse.org/opensuse/bci/apache-tomcat:10.1-openjdk17
 ```
 
 The deployed webapp is then accessible via `http://localhost:8080/$webapp_name`.
@@ -38,7 +38,7 @@ follows:
 ```ShellSession
 $ chmod 0777 /path/to/my/app
 $ podman run --rm -d -v /path/to/my/app:/usr/share/tomcat/webapps:z \
-      -p 8080:8080 registry.opensuse.org/opensuse/apache-tomcat:10.1-openjdk17
+      -p 8080:8080 registry.opensuse.org/opensuse/bci/apache-tomcat:10.1-openjdk17
 ```
 
 
@@ -54,7 +54,7 @@ options to the container runtime using the `-e` flag:
 ```ShellSession
 $ podman run -it --rm \
       -e JAVA_OPTS="-Xmx1024m" -p 8080:8080 \
-      registry.opensuse.org/opensuse/apache-tomcat:10.1-openjdk17
+      registry.opensuse.org/opensuse/bci/apache-tomcat:10.1-openjdk17
 ```
 
 The image ships with `CATALINA_HOME` set to `/usr/share/tomcat`

diff --git a/apache-tomcat-10-java-21-image/Dockerfile b/apache-tomcat-10-java-21-image/Dockerfile
@@ -15,9 +15,9 @@
 
 #!UseOBSRepositories
 
-#!BuildTag: opensuse/apache-tomcat:10.1-openjdk21
-#!BuildTag: opensuse/apache-tomcat:10.1-openjdk21-%RELEASE%
-#!BuildTag: opensuse/apache-tomcat:%%tomcat_version%%-openjdk21
+#!BuildTag: opensuse/bci/apache-tomcat:10.1-openjdk21
+#!BuildTag: opensuse/bci/apache-tomcat:10.1-openjdk21-%RELEASE%
+#!BuildTag: opensuse/bci/apache-tomcat:%%tomcat_version%%-openjdk21
 
 FROM opensuse/bci/bci-micro:latest AS target
 FROM opensuse/tumbleweed:latest AS builder
@@ -41,7 +41,7 @@ LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="openSUSE Project"
 LABEL org.opencontainers.image.source="%SOURCEURL%"
 LABEL org.opencontainers.image.ref.name="10.1-openjdk21-%RELEASE%"
-LABEL org.opensuse.reference="registry.opensuse.org/opensuse/apache-tomcat:10.1-openjdk21-%RELEASE%"
+LABEL org.opensuse.reference="registry.opensuse.org/opensuse/bci/apache-tomcat:10.1-openjdk21-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL org.opensuse.lifecycle-url="https://en.opensuse.org/Lifetime#openSUSE_BCI"
 LABEL org.opensuse.release-stage="released"

diff --git a/apache-tomcat-10-java-21-image/README.md b/apache-tomcat-10-java-21-image/README.md
@@ -21,7 +21,7 @@ To deploy an application, copy the `.war` file into
 `$CATALINA_BASE/webapps` (either during a container build or by bind-mounting
 the directory), and launch the container using the following command:
 ```ShellSession
-$ podman run -d --rm -p 8080:8080 registry.opensuse.org/opensuse/apache-tomcat:10.1-openjdk21
+$ podman run -d --rm -p 8080:8080 registry.opensuse.org/opensuse/bci/apache-tomcat:10.1-openjdk21
 ```
 
 The deployed webapp is then accessible via `http://localhost:8080/$webapp_name`.
@@ -38,7 +38,7 @@ follows:
 ```ShellSession
 $ chmod 0777 /path/to/my/app
 $ podman run --rm -d -v /path/to/my/app:/usr/share/tomcat/webapps:z \
-      -p 8080:8080 registry.opensuse.org/opensuse/apache-tomcat:10.1-openjdk21
+      -p 8080:8080 registry.opensuse.org/opensuse/bci/apache-tomcat:10.1-openjdk21
 ```
 
 
@@ -54,7 +54,7 @@ options to the container runtime using the `-e` flag:
 ```ShellSession
 $ podman run -it --rm \
       -e JAVA_OPTS="-Xmx1024m" -p 8080:8080 \
-      registry.opensuse.org/opensuse/apache-tomcat:10.1-openjdk21
+      registry.opensuse.org/opensuse/bci/apache-tomcat:10.1-openjdk21
 ```
 
 The image ships with `CATALINA_HOME` set to `/usr/share/tomcat`

diff --git a/apache-tomcat-10-java-22-image/Dockerfile b/apache-tomcat-10-java-22-image/Dockerfile
@@ -15,10 +15,10 @@
 
 #!UseOBSRepositories
 
-#!BuildTag: opensuse/apache-tomcat:10.1-openjdk22
-#!BuildTag: opensuse/apache-tomcat:10.1-openjdk22-%RELEASE%
-#!BuildTag: opensuse/apache-tomcat:%%tomcat_version%%-openjdk22
-#!BuildTag: opensuse/apache-tomcat:latest
+#!BuildTag: opensuse/bci/apache-tomcat:10.1-openjdk22
+#!BuildTag: opensuse/bci/apache-tomcat:10.1-openjdk22-%RELEASE%
+#!BuildTag: opensuse/bci/apache-tomcat:%%tomcat_version%%-openjdk22
+#!BuildTag: opensuse/bci/apache-tomcat:latest
 
 FROM opensuse/bci/bci-micro:latest AS target
 FROM opensuse/tumbleweed:latest AS builder
@@ -42,7 +42,7 @@ LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="openSUSE Project"
 LABEL org.opencontainers.image.source="%SOURCEURL%"
 LABEL org.opencontainers.image.ref.name="10.1-openjdk22-%RELEASE%"
-LABEL org.opensuse.reference="registry.opensuse.org/opensuse/apache-tomcat:10.1-openjdk22-%RELEASE%"
+LABEL org.opensuse.reference="registry.opensuse.org/opensuse/bci/apache-tomcat:10.1-openjdk22-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL org.opensuse.lifecycle-url="https://en.opensuse.org/Lifetime#openSUSE_BCI"
 LABEL org.opensuse.release-stage="released"

diff --git a/apache-tomcat-10-java-22-image/README.md b/apache-tomcat-10-java-22-image/README.md
@@ -21,7 +21,7 @@ To deploy an application, copy the `.war` file into
 `$CATALINA_BASE/webapps` (either during a container build or by bind-mounting
 the directory), and launch the container using the following command:
 ```ShellSession
-$ podman run -d --rm -p 8080:8080 registry.opensuse.org/opensuse/apache-tomcat:10.1-openjdk22
+$ podman run -d --rm -p 8080:8080 registry.opensuse.org/opensuse/bci/apache-tomcat:10.1-openjdk22
 ```
 
 The deployed webapp is then accessible via `http://localhost:8080/$webapp_name`.
@@ -38,7 +38,7 @@ follows:
 ```ShellSession
 $ chmod 0777 /path/to/my/app
 $ podman run --rm -d -v /path/to/my/app:/usr/share/tomcat/webapps:z \
-      -p 8080:8080 registry.opensuse.org/opensuse/apache-tomcat:10.1-openjdk22
+      -p 8080:8080 registry.opensuse.org/opensuse/bci/apache-tomcat:10.1-openjdk22
 ```
 
 
@@ -54,7 +54,7 @@ options to the container runtime using the `-e` flag:
 ```ShellSession
 $ podman run -it --rm \
       -e JAVA_OPTS="-Xmx1024m" -p 8080:8080 \
-      registry.opensuse.org/opensuse/apache-tomcat:10.1-openjdk22
+      registry.opensuse.org/opensuse/bci/apache-tomcat:10.1-openjdk22
 ```
 
 The image ships with `CATALINA_HOME` set to `/usr/share/tomcat`

diff --git a/apache-tomcat-9-java-17-image/Dockerfile b/apache-tomcat-9-java-17-image/Dockerfile
@@ -15,9 +15,9 @@
 
 #!UseOBSRepositories
 
-#!BuildTag: opensuse/apache-tomcat:9-openjdk17
-#!BuildTag: opensuse/apache-tomcat:9-openjdk17-%RELEASE%
-#!BuildTag: opensuse/apache-tomcat:%%tomcat_version%%-openjdk17
+#!BuildTag: opensuse/bci/apache-tomcat:9-openjdk17
+#!BuildTag: opensuse/bci/apache-tomcat:9-openjdk17-%RELEASE%
+#!BuildTag: opensuse/bci/apache-tomcat:%%tomcat_version%%-openjdk17
 
 FROM opensuse/bci/bci-micro:latest AS target
 FROM opensuse/tumbleweed:latest AS builder
@@ -41,7 +41,7 @@ LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="openSUSE Project"
 LABEL org.opencontainers.image.source="%SOURCEURL%"
 LABEL org.opencontainers.image.ref.name="9-openjdk17-%RELEASE%"
-LABEL org.opensuse.reference="registry.opensuse.org/opensuse/apache-tomcat:9-openjdk17-%RELEASE%"
+LABEL org.opensuse.reference="registry.opensuse.org/opensuse/bci/apache-tomcat:9-openjdk17-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL org.opensuse.lifecycle-url="https://en.opensuse.org/Lifetime#openSUSE_BCI"
 LABEL org.opensuse.release-stage="released"

diff --git a/apache-tomcat-9-java-17-image/README.md b/apache-tomcat-9-java-17-image/README.md
@@ -21,7 +21,7 @@ To deploy an application, copy the `.war` file into
 `$CATALINA_BASE/webapps` (either during a container build or by bind-mounting
 the directory), and launch the container using the following command:
 ```ShellSession
-$ podman run -d --rm -p 8080:8080 registry.opensuse.org/opensuse/apache-tomcat:9-openjdk17
+$ podman run -d --rm -p 8080:8080 registry.opensuse.org/opensuse/bci/apache-tomcat:9-openjdk17
 ```
 
 The deployed webapp is then accessible via `http://localhost:8080/$webapp_name`.
@@ -38,7 +38,7 @@ follows:
 ```ShellSession
 $ chmod 0777 /path/to/my/app
 $ podman run --rm -d -v /path/to/my/app:/usr/share/tomcat/webapps:z \
-      -p 8080:8080 registry.opensuse.org/opensuse/apache-tomcat:9-openjdk17
+      -p 8080:8080 registry.opensuse.org/opensuse/bci/apache-tomcat:9-openjdk17
 ```
 
 
@@ -54,7 +54,7 @@ options to the container runtime using the `-e` flag:
 ```ShellSession
 $ podman run -it --rm \
       -e JAVA_OPTS="-Xmx1024m" -p 8080:8080 \
-      registry.opensuse.org/opensuse/apache-tomcat:9-openjdk17
+      registry.opensuse.org/opensuse/bci/apache-tomcat:9-openjdk17
 ```
 
 The image ships with `CATALINA_HOME` set to `/usr/share/tomcat`

diff --git a/blackbox_exporter-image/Dockerfile b/blackbox_exporter-image/Dockerfile
@@ -15,10 +15,10 @@
 
 #!UseOBSRepositories
 
-#!BuildTag: opensuse/blackbox_exporter:%%blackbox_exporter_patch_version%%
-#!BuildTag: opensuse/blackbox_exporter:%%blackbox_exporter_patch_version%%-%RELEASE%
-#!BuildTag: opensuse/blackbox_exporter:%%blackbox_exporter_minor_version%%
-#!BuildTag: opensuse/blackbox_exporter:latest
+#!BuildTag: opensuse/bci/blackbox_exporter:%%blackbox_exporter_patch_version%%
+#!BuildTag: opensuse/bci/blackbox_exporter:%%blackbox_exporter_patch_version%%-%RELEASE%
+#!BuildTag: opensuse/bci/blackbox_exporter:%%blackbox_exporter_minor_version%%
+#!BuildTag: opensuse/bci/blackbox_exporter:latest
 
 FROM opensuse/tumbleweed:latest
 
@@ -38,7 +38,7 @@ LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="openSUSE Project"
 LABEL org.opencontainers.image.source="%SOURCEURL%"
 LABEL org.opencontainers.image.ref.name="%%blackbox_exporter_patch_version%%-%RELEASE%"
-LABEL org.opensuse.reference="registry.opensuse.org/opensuse/blackbox_exporter:%%blackbox_exporter_patch_version%%-%RELEASE%"
+LABEL org.opensuse.reference="registry.opensuse.org/opensuse/bci/blackbox_exporter:%%blackbox_exporter_patch_version%%-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL org.opensuse.lifecycle-url="https://en.opensuse.org/Lifetime#openSUSE_BCI"
 LABEL org.opensuse.release-stage="released"

diff --git a/distribution-image/README.md b/distribution-image/README.md
@@ -31,7 +31,7 @@ Then you can start the container with the following command:
 
 ```bash
 podman run -d --restart=always -p 5000:5000 -v /path/to/config.yml:/etc/registry/config.yml \
-  -v /var/lib/docker-registry:/var/lib/docker-registry --name registry registry.opensuse.org/opensuse/registry:%%registry_version%%-%RELEASE%
+  -v /var/lib/docker-registry:/var/lib/docker-registry --name registry registry.opensuse.org/opensuse/bci/registry:%%registry_version%%-%RELEASE%
 ```
 
 The registry is available at `http://localhost:5000`. To keep the registry running after a reboot, create a systemd service as follows:

diff --git a/distribution-image/distribution-image.kiwi b/distribution-image/distribution-image.kiwi
@@ -14,7 +14,7 @@ https://github.com/SUSE/BCI-dockerfile-generator
 Please submit bugfixes or comments via https://bugs.opensuse.org/
 You can contact the BCI team via https://github.com/SUSE/bci/discussions
 -->
-<!-- OBS-AddTag: opensuse/registry:%%registry_version%% opensuse/registry:%%registry_version%%-%RELEASE% opensuse/registry:latest -->
+<!-- OBS-AddTag: opensuse/bci/registry:%%registry_version%% opensuse/bci/registry:%%registry_version%%-%RELEASE% opensuse/bci/registry:latest -->
 <!-- OBS-Imagerepo: obsrepositories:/ -->
 
 <image schemaversion="7.4" name="registry-image" xmlns:suse_label_helper="com.suse.label_helper">
@@ -26,7 +26,7 @@ You can contact the BCI team via https://github.com/SUSE/bci/discussions
   <preferences>
     <type image="docker" derived_from="obsrepositories:/opensuse/bci/bci-micro#latest">
       <containerconfig
-          name="opensuse/registry"
+          name="opensuse/bci/registry"
           tag="%%registry_version%%"
           additionaltags="%%registry_version%%-%RELEASE%,latest"
           user="registry">
@@ -41,7 +41,7 @@ You can contact the BCI team via https://github.com/SUSE/bci/discussions
             <label name="org.opencontainers.image.source" value="%SOURCEURL%"/>
             <label name="org.opencontainers.image.url" value="https://www.opensuse.org"/>
             <label name="org.opencontainers.image.ref.name" value="%%registry_version%%-%RELEASE%"/>
-            <label name="org.opensuse.reference" value="registry.opensuse.org/opensuse/registry:%%registry_version%%-%RELEASE%"/>
+            <label name="org.opensuse.reference" value="registry.opensuse.org/opensuse/bci/registry:%%registry_version%%-%RELEASE%"/>
             <label name="org.openbuildservice.disturl" value="%DISTURL%"/>
             <label name="org.opensuse.release-stage" value="released"/>
             <label name="org.opensuse.lifecycle-url" value="https://en.opensuse.org/Lifetime#openSUSE_BCI"/>

diff --git a/git-image/git-image.kiwi b/git-image/git-image.kiwi
@@ -14,7 +14,7 @@ https://github.com/SUSE/BCI-dockerfile-generator
 Please submit bugfixes or comments via https://bugs.opensuse.org/
 You can contact the BCI team via https://github.com/SUSE/bci/discussions
 -->
-<!-- OBS-AddTag: opensuse/git:%%git_minor_version%% opensuse/git:%%git_minor_version%%-%RELEASE% opensuse/git:%%git_major_version%% opensuse/git:%%git_version%% opensuse/git:latest -->
+<!-- OBS-AddTag: opensuse/bci/git:%%git_minor_version%% opensuse/bci/git:%%git_minor_version%%-%RELEASE% opensuse/bci/git:%%git_major_version%% opensuse/bci/git:%%git_version%% opensuse/bci/git:latest -->
 <!-- OBS-Imagerepo: obsrepositories:/ -->
 
 <image schemaversion="7.4" name="git-image" xmlns:suse_label_helper="com.suse.label_helper">
@@ -26,7 +26,7 @@ You can contact the BCI team via https://github.com/SUSE/bci/discussions
   <preferences>
     <type image="docker" derived_from="obsrepositories:/opensuse/bci/bci-micro#latest">
       <containerconfig
-          name="opensuse/git"
+          name="opensuse/bci/git"
           tag="%%git_minor_version%%"
           additionaltags="%%git_minor_version%%-%RELEASE%,%%git_major_version%%,%%git_version%%,latest">
         <labels>
@@ -40,7 +40,7 @@ You can contact the BCI team via https://github.com/SUSE/bci/discussions
             <label name="org.opencontainers.image.source" value="%SOURCEURL%"/>
             <label name="org.opencontainers.image.url" value="https://www.opensuse.org"/>
             <label name="org.opencontainers.image.ref.name" value="%%git_minor_version%%-%RELEASE%"/>
-            <label name="org.opensuse.reference" value="registry.opensuse.org/opensuse/git:%%git_minor_version%%-%RELEASE%"/>
+            <label name="org.opensuse.reference" value="registry.opensuse.org/opensuse/bci/git:%%git_minor_version%%-%RELEASE%"/>
             <label name="org.openbuildservice.disturl" value="%DISTURL%"/>
             <label name="org.opensuse.release-stage" value="released"/>
             <label name="org.opensuse.lifecycle-url" value="https://en.opensuse.org/Lifetime#openSUSE_BCI"/>

diff --git a/grafana-image/Dockerfile b/grafana-image/Dockerfile
@@ -15,11 +15,11 @@
 
 #!UseOBSRepositories
 
-#!BuildTag: opensuse/grafana:%%grafana_patch_version%%
-#!BuildTag: opensuse/grafana:%%grafana_patch_version%%-%RELEASE%
-#!BuildTag: opensuse/grafana:%%grafana_minor_version%%
-#!BuildTag: opensuse/grafana:%%grafana_major_version%%
-#!BuildTag: opensuse/grafana:latest
+#!BuildTag: opensuse/bci/grafana:%%grafana_patch_version%%
+#!BuildTag: opensuse/bci/grafana:%%grafana_patch_version%%-%RELEASE%
+#!BuildTag: opensuse/bci/grafana:%%grafana_minor_version%%
+#!BuildTag: opensuse/bci/grafana:%%grafana_major_version%%
+#!BuildTag: opensuse/bci/grafana:latest
 
 FROM opensuse/tumbleweed:latest
 
@@ -39,7 +39,7 @@ LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="openSUSE Project"
 LABEL org.opencontainers.image.source="%SOURCEURL%"
 LABEL org.opencontainers.image.ref.name="%%grafana_patch_version%%-%RELEASE%"
-LABEL org.opensuse.reference="registry.opensuse.org/opensuse/grafana:%%grafana_patch_version%%-%RELEASE%"
+LABEL org.opensuse.reference="registry.opensuse.org/opensuse/bci/grafana:%%grafana_patch_version%%-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL org.opensuse.lifecycle-url="https://en.opensuse.org/Lifetime#openSUSE_BCI"
 LABEL org.opensuse.release-stage="released"