diff --git a/.github/workflows/as400.yml b/.github/workflows/as400.yml
index 0df6562f8..42a524194 100644
--- a/.github/workflows/as400.yml
+++ b/.github/workflows/as400.yml
@@ -64,8 +64,8 @@ jobs:
           -type f \
           -exec grep -E '(@CONNECTOR_VERSION@)|(@CONNECTOR_HOME@)|(@CONNECTOR_ETC@)|(@CONNECTOR_LOG@)|(@CONNECTOR_USER@)|(@JAVA_BIN@)' {} ';'   \
           -exec sed -i \
-          -e 's|@CONNECTOR_VERSION@|'"%{version}"'|g' \
-          -e 's|@CONNECTOR_HOME@|'"%{_datadir}/centreon-as400"'|g' \
+          -e 's|@CONNECTOR_VERSION@|'"${{ needs.get-environment.outputs.version }}"'|g' \
+          -e 's|@CONNECTOR_HOME@|'"/usr/share/centreon-as400"'|g' \
           -e 's|@CONNECTOR_ETC@|'"/etc/centreon-as400/"'|g' \
           -e 's|@CONNECTOR_LOG@|'"/var/log/centreon-as400/"'|g' \
           -e 's|@CONNECTOR_USER@|'"centreon-as400"'|g' \
diff --git a/as400/changelog b/as400/changelog
index 9b920168d..c019af1bf 100644
--- a/as400/changelog
+++ b/as400/changelog
@@ -1,5 +1,5 @@
 2024-10-21 Pieter Kippes <pkippes@centreon.com> - 2.0.6
- * Fixed packaging
+ * Fixed packaging issues with config files and java version
 
 2024-10-18 Pieter Kippes <pkippes@centreon.com> - 2.0.5
  * Fixed packaging for config files
diff --git a/as400/connector.as400/pom.xml b/as400/connector.as400/pom.xml
index 172af35d1..689d8b1e3 100644
--- a/as400/connector.as400/pom.xml
+++ b/as400/connector.as400/pom.xml
@@ -73,8 +73,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.13.0</version>
                 <configuration>
-                    <source>17</source>
-                    <target>17</target>
+                    <source>11</source>
+                    <target>11</target>
                 </configuration>
             </plugin>
 
diff --git a/as400/packaging/centreon-as400-daemon.yaml b/as400/packaging/centreon-as400-daemon.yaml
index df81ff662..d51ce1180 100644
--- a/as400/packaging/centreon-as400-daemon.yaml
+++ b/as400/packaging/centreon-as400-daemon.yaml
@@ -14,8 +14,8 @@ homepage: "https://www.centreon.com"
 license: "Apache-2.0"
 
 contents:
-  - src: "../connector.as400/target/centreon-as400-${VERSION}-jar-with-dependencies.jar" # VARIABLE VERSION REQUIRED HERE
-    dst: "/usr/share/centreon-as400/bin/centreon-as400-${VERSION}-jar-with-dependencies.jar" # VARIABLE VERSION REQUIRED HERE
+  - src: "../connector.as400/target/centreon-as400-@CONNECTOR_VERSION@-jar-with-dependencies.jar" # VARIABLE VERSION REQUIRED HERE
+    dst: "/usr/share/centreon-as400/bin/centreon-as400-@CONNECTOR_VERSION@-jar-with-dependencies.jar" # VARIABLE VERSION REQUIRED HERE
     expand: true
     file_info:
       mode: 0755
@@ -60,10 +60,10 @@ scripts:
 overrides:
   rpm:
     depends:
-      - java-1.8.0-openjdk
+      - "java-17-openjdk"
   deb:
     depends:
-      - default-jre
+      - "openjdk-17-jre"
 
 rpm:
   summary: Centreon AS 400 Plugin daemon