diff --git a/ansible/roles/authelia/tasks/main.json b/ansible/roles/authelia/tasks/main.json
index 92811fa..8c023e8 100644
--- a/ansible/roles/authelia/tasks/main.json
+++ b/ansible/roles/authelia/tasks/main.json
@@ -123,6 +123,7 @@
 		"become": true,
 		"ansible.builtin.systemd_service": {
 			"state": "restarted",
+			"enabled": true,
 			"name": "authelia"
 		}
 	}
diff --git a/ansible/roles/gitlab/info.md b/ansible/roles/gitlab/info.md
index 3031aba..7d7abde 100644
--- a/ansible/roles/gitlab/info.md
+++ b/ansible/roles/gitlab/info.md
@@ -9,3 +9,9 @@ Software-Entwickler-Plattform [GitLab](https://about.gitlab.com/)
 - [LinuxTechi | How to Install GitLab on Debian 12 Step-by-Step](https://www.linuxtechi.com/how-to-install-gitlab-on-debian/)
 - [Dokumentation | Configuration](https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/README.md)
 - [Authelia | Dokumentation | Integration for GitLab](https://www.authelia.com/integration/openid-connect/gitlab/#application)
+
+
+## ToDo
+
+- `gitlab-ctl start` und `gitlab-ctl stop` in ein systemd-Skript packen
+- service aktivieren
diff --git a/ansible/roles/gitlab/tasks/main.json b/ansible/roles/gitlab/tasks/main.json
index fd28176..d5c9cdb 100644
--- a/ansible/roles/gitlab/tasks/main.json
+++ b/ansible/roles/gitlab/tasks/main.json
@@ -19,7 +19,7 @@
 		}
 	},
 	{
-		"name": "prerequisites",
+		"name": "package installation",
 		"become": true,
 		"ansible.builtin.apt": {
 			"pkg": [
diff --git a/ansible/roles/gitlab/templates/gitlab.rb.j2 b/ansible/roles/gitlab/templates/gitlab.rb.j2
index 4085433..b3b0107 100644
--- a/ansible/roles/gitlab/templates/gitlab.rb.j2
+++ b/ansible/roles/gitlab/templates/gitlab.rb.j2
@@ -581,7 +581,7 @@ gitlab_rails['omniauth_providers'] = [
     args: {
       name: "openid_connect",
       strategy_class: "OmniAuth::Strategies::OpenIDConnect",
-      issuer: "{{authentication_data_authelia_url_base}}",
+      issuer: "{{var_gitlab_authentication_data_authelia_url_base}}",
       discovery: true,
       scope: ["openid","profile","email","groups"],
       client_auth_method: "basic",
@@ -752,34 +752,6 @@ gitlab_rails['omniauth_providers'] = [
 #### whole RAILS env takes a lot of time.
 # gitlab_rails['rake_cache_clear'] = true
 
-### GitLab database settings
-###! Docs: https://docs.gitlab.com/omnibus/settings/database.html
-###! **Only needed if you use an external database.**
-# gitlab_rails['db_adapter'] = "postgresql"
-# gitlab_rails['db_encoding'] = "unicode"
-# gitlab_rails['db_collation'] = nil
-# gitlab_rails['db_database'] = "gitlabhq_production"
-# gitlab_rails['db_username'] = "gitlab"
-# gitlab_rails['db_password'] = nil
-# gitlab_rails['db_host'] = nil
-# gitlab_rails['db_port'] = 5432
-# gitlab_rails['db_socket'] = nil
-# gitlab_rails['db_sslmode'] = nil
-# gitlab_rails['db_sslcompression'] = 0
-# gitlab_rails['db_sslrootcert'] = nil
-# gitlab_rails['db_sslcert'] = nil
-# gitlab_rails['db_sslkey'] = nil
-# gitlab_rails['db_prepared_statements'] = false
-# gitlab_rails['db_statements_limit'] = 1000
-# gitlab_rails['db_connect_timeout'] = nil
-# gitlab_rails['db_keepalives'] = nil
-# gitlab_rails['db_keepalives_idle'] = nil
-# gitlab_rails['db_keepalives_interval'] = nil
-# gitlab_rails['db_keepalives_count'] = nil
-# gitlab_rails['db_tcp_user_timeout'] = nil
-# gitlab_rails['db_application_name'] = nil
-# gitlab_rails['db_database_tasks'] = true
-
 ### Gitlab decomposed database settings
 ###! Docs: https://docs.gitlab.com/omnibus/settings/database.html
 # gitlab_rails['databases']['ci']['enable'] = true
@@ -1334,26 +1306,14 @@ gitlab_rails['omniauth_providers'] = [
 ## GitLab PostgreSQL
 ################################################################
 
+{% if var_gitlab_database_kind == 'internal' %}
 ###! Changing any of these settings requires a restart of postgresql.
 ###! By default, reconfigure reloads postgresql if it is running. If you
 ###! change any of these settings, be sure to run `gitlab-ctl restart postgresql`
 ###! after reconfigure in order for the changes to take effect.
-
-{% if var_gitlab_database_kind == 'internal' %}
 postgresql['enable'] = true
 # postgresql['listen_address'] = nil
 # postgresql['port'] = 5432
-{% endif %}
-{% if var_gitlab_database_kind == 'postgresql' %}
-postgresql['enable'] = false
-
-gitlab_rails['db_adapter'] = 'postgresql'
-gitlab_rails['db_encoding'] = 'utf8'
-gitlab_rails['db_host'] = '{{var_gitlab_database_data_postgresql_host}}'
-gitlab_rails['db_port'] = {{var_gitlab_database_data_postgresql_port | string}}
-gitlab_rails['db_username'] = '{{var_gitlab_database_data_postgresql_username}}'
-gitlab_rails['db_password'] = '{{var_gitlab_database_data_postgresql_password}}'
-{% endif %}
 
 ## Only used when Patroni is enabled. This is the port that PostgreSQL responds to other
 ## cluster members. This port is used by Patroni to advertize the PostgreSQL connection
@@ -1496,6 +1456,40 @@ gitlab_rails['db_password'] = '{{var_gitlab_database_data_postgresql_password}}'
 
 ##! Automatically restart PostgreSQL service when version changes.
 # postgresql['auto_restart_on_version_change'] = true
+{% endif %}
+
+{% if var_gitlab_database_kind == 'postgresql' %}
+postgresql['enable'] = false
+
+### GitLab database settings
+###! Docs: https://docs.gitlab.com/omnibus/settings/database.html
+###! **Only needed if you use an external database.**
+gitlab_rails['db_adapter'] = 'postgresql'
+gitlab_rails['db_encoding'] = 'utf8'
+# gitlab_rails['db_collation'] = nil
+gitlab_rails['db_database'] = '{{var_gitlab_database_data_postgresql_schema}}'
+gitlab_rails['db_username'] = '{{var_gitlab_database_data_postgresql_username}}'
+gitlab_rails['db_password'] = '{{var_gitlab_database_data_postgresql_password}}'
+gitlab_rails['db_host'] = '{{var_gitlab_database_data_postgresql_host}}'
+gitlab_rails['db_port'] = {{var_gitlab_database_data_postgresql_port | string}}
+# gitlab_rails['db_socket'] = nil
+# gitlab_rails['db_sslmode'] = nil
+# gitlab_rails['db_sslcompression'] = 0
+# gitlab_rails['db_sslrootcert'] = nil
+# gitlab_rails['db_sslcert'] = nil
+# gitlab_rails['db_sslkey'] = nil
+# gitlab_rails['db_prepared_statements'] = false
+# gitlab_rails['db_statements_limit'] = 1000
+# gitlab_rails['db_connect_timeout'] = nil
+# gitlab_rails['db_keepalives'] = nil
+# gitlab_rails['db_keepalives_idle'] = nil
+# gitlab_rails['db_keepalives_interval'] = nil
+# gitlab_rails['db_keepalives_count'] = nil
+# gitlab_rails['db_tcp_user_timeout'] = nil
+# gitlab_rails['db_application_name'] = nil
+# gitlab_rails['db_database_tasks'] = true
+{% endif %}
+
 
 ################################################################################
 ## GitLab Redis