diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 158a76443851dbc021be7ae7f33f8a3beb1a25da..11834ac08cb4b6b1b5b4cc008ac4518598a31e25 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,18 +1,17 @@
-#include:
- # - template: Jobs/SAST.gitlab-ci.yml
+include:
+  - template: Jobs/SAST.gitlab-ci.yml
 
 cache:
   paths:
     - .m2/repository
 
-stages:
-  - build
-  #- test
-  #- package
-
 variables:
   MAVEN_OPTS: "-Dmaven.repo.local=$CI_PROJECT_DIR/.m2/repository"
 
+stages:
+  - build
+  - test
+  - package
 
 build-battlearena:
   stage: build
@@ -21,3 +20,28 @@ build-battlearena:
     - "echo 'Starting Build Stage'"
     - "mvn compile -X"
 
+test-battlearena:
+  stage: test
+  image: maven:3.9.4-eclipse-temurin-20
+  script:
+    - "echo 'Starting Test Stage'"
+    - "mvn test"
+  artifacts:
+    reports:
+      junit:
+        - target/surefire-reports/TEST-*.xml
+        - target/failsafe-reports/TEST-*.xml
+
+package-battlearena:
+  stage: package
+  image: maven:3.9.4-eclipse-temurin-20
+  script:
+    - "echo 'Starting Package Stage'"
+    - "mvn package"
+  only:
+    refs:
+      - main
+  artifacts:
+    paths:
+      - target/*.jar
+    expire_in: 2 days