diff --git a/imageroot/etc/state-include.conf b/imageroot/etc/state-include.conf
index 0480c2d..fa7dd90 100644
--- a/imageroot/etc/state-include.conf
+++ b/imageroot/etc/state-include.conf
@@ -6,5 +6,5 @@
 
 
 state/smarthost.env
-volumes/html
-volumes/mysql-data
+volumes/glpi_html
+volumes/mysql-data
\ No newline at end of file
diff --git a/imageroot/systemd/user/glpi-app.service b/imageroot/systemd/user/glpi-app.service
index d6de00b..bcd5f57 100644
--- a/imageroot/systemd/user/glpi-app.service
+++ b/imageroot/systemd/user/glpi-app.service
@@ -21,8 +21,10 @@ ExecStartPre=-runagent discover-smarthost
 ExecStart=/usr/bin/podman run --conmon-pidfile %t/glpi-app.pid \
     --cidfile %t/glpi-app.ctr-id --cgroups=no-conmon \
     --pod-id-file %t/glpi.pod-id --replace -d --name  glpi-app \
-    --volume html:/var/www/html/glpi \
-    --env=MARIADB_* \
+    --volume glpi_html:/var/www/html/glpi \
+    --env=GLPI_* \
+    --env VERSION_GLPI=10.0.12 \
+    --env TIMEZONE=Europe/Brussels \
     --env MARIADB_DB_TYPE=mysql \
     --env MARIADB_DB_HOST=127.0.0.1 \
     --env MARIADB_DB_PORT=3306 \
diff --git a/imageroot/update-module.d/20restart b/imageroot/update-module.d/20restart
index ae0f791..3697388 100755
--- a/imageroot/update-module.d/20restart
+++ b/imageroot/update-module.d/20restart
@@ -12,4 +12,4 @@ set -e
 # Redirect any output to the journal (stderr)
 exec 1>&2
 
-systemctl --user try-restart kickstart.service
+systemctl --user try-restart glpi.service
diff --git a/tests/glpi.robot b/tests/glpi.robot
new file mode 100644
index 0000000..4362479
--- /dev/null
+++ b/tests/glpi.robot
@@ -0,0 +1,25 @@
+*** Settings ***
+Library    SSHLibrary
+
+*** Test Cases ***
+Check if glpi is installed correctly
+    ${output}  ${rc} =    Execute Command    add-module ${IMAGE_URL} 1
+    ...    return_rc=True
+    Should Be Equal As Integers    ${rc}  0
+    &{output} =    Evaluate    ${output}
+    Set Suite Variable    ${module_id}    ${output.module_id}
+
+Check if glpi can be configured
+    ${rc} =    Execute Command    api-cli run module/${module_id}/configure-module --data '{}'
+    ...    return_rc=True  return_stdout=False
+    Should Be Equal As Integers    ${rc}  0
+
+Check if glpi works as expected
+    ${rc} =    Execute Command    curl -f http://127.0.0.1/glpi/
+    ...    return_rc=True  return_stdout=False
+    Should Be Equal As Integers    ${rc}  0
+
+Check if glpi is removed correctly
+    ${rc} =    Execute Command    remove-module --no-preserve ${module_id}
+    ...    return_rc=True  return_stdout=False
+    Should Be Equal As Integers    ${rc}  0
diff --git a/ui/public/metadata.json b/ui/public/metadata.json
index d3831c7..e4bf57e 100644
--- a/ui/public/metadata.json
+++ b/ui/public/metadata.json
@@ -16,8 +16,8 @@
   ],
   "docs": {
     "documentation_url": "https://glpi-project.org/documentation/",
-    "bug_url": "https://github.com/kemboi22/ns8-glpi",
-    "code_url": "https://github.com/kemboi22/ns8-glpi"
+    "bug_url": "https://github.com/geniusdynamics/ns8-glpi",
+    "code_url": "https://github.com/geniusdynamics/ns8-glpi"
   },
-  "source": "ghcr.io/kemboi22/glpi"
+  "source": "ghcr.io/geniusdynamics/glpi"
 }