diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6e94cecc9..3cc4952fb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,19 +5,19 @@ include:
     ref: 'main'
     file: 'ci-templates/gradle_java.yml'
 
-deploy:
+bom:
   stage: deploy
   tags:
     - dind
   script:
-    - echo "Building with gradle version ${BUILDVERSION}"
-    - gradle -Pversion=${BUILDVERSION} publish
-    - gradle bootBuildImage --publishImage -PbuildbootDockerHostNetwork=true -Pversion=${BUILDVERSION}
-    - echo "BUILDVERSION=$BUILDVERSION" >> version.env
+    - gradle cyclonedxBom
+    - echo "Publishing the generated BOM"
+    - pwd
+    - ls -la
+    - ls persistence-service-v1/persistence-service-server-v1/build/reports
   artifacts:
     reports:
-      dotenv: version.env
-  rules:
-    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
-    - if: $CI_COMMIT_BRANCH =~ /^release/
-    - if: $CI_COMMIT_TAG
\ No newline at end of file
+      cyclonedx:
+        - persistence-service-v1/persistence-service-server-v1/build/reports/bom.json
+    paths:
+      - persistence-service-v1/persistence-service-server-v1/build/reports/bom.json
diff --git a/persistence-service-v1/persistence-service-server-v1/build.gradle.kts b/persistence-service-v1/persistence-service-server-v1/build.gradle.kts
index 521247b80..fb0718cc0 100644
--- a/persistence-service-v1/persistence-service-server-v1/build.gradle.kts
+++ b/persistence-service-v1/persistence-service-server-v1/build.gradle.kts
@@ -7,6 +7,7 @@ plugins {
     id("io.spring.dependency-management") version "1.1.3"
     id("org.sonarqube") version "4.4.1.3373"
     id("io.freefair.lombok") version "8.4"
+    id ("org.cyclonedx.bom") version "1.8.2"
 }
 
 configurations {