diff --git a/templates/default b/templates/default
index 6e9c7df5bc875a5b7abcdf2a1cb31d98656c7f74..a07959012d079bc86765fefddd0cb51de239303d 100644
--- a/templates/default
+++ b/templates/default
@@ -23,7 +23,7 @@
 <VirtualHost *:80>
   Include /etc/apache2/{{ apache_conf_dir }}/global-redirect.conf
 
-  ServerName gitlab.paragon-es.de
+  ServerName gitlab.lakedrops.com
   ServerSignature Off
 
   RewriteEngine on
@@ -34,7 +34,7 @@
 <VirtualHost *:80>
   Include /etc/apache2/{{ apache_conf_dir }}/global-redirect.conf
 
-  ServerName mattermost.paragon-es.de
+  ServerName mattermost.lakedrops.com
   ServerSignature Off
 
   RewriteEngine on
diff --git a/templates/gitlab.rb b/templates/gitlab.rb
index 5ce74f4b9a363ca13b4cf31ad80fbb1cd87b9e34..65dc492b4b4c533714fd4355eec664681d11d90e 100644
--- a/templates/gitlab.rb
+++ b/templates/gitlab.rb
@@ -428,7 +428,7 @@ nginx['enable'] = false
 # application.yml configuration #
 #################################
 
-# gitlab_ci['gitlab_server'] = { "url" => 'https://gitlab.paragon-es.de', "app_id" => '12345678', "app_secret" => 'QWERTY12345' }
+# gitlab_ci['gitlab_server'] = { "url" => 'https://{{ gitlab_domain }}', "app_id" => '12345678', "app_secret" => 'QWERTY12345' }
 
 # gitlab_ci['gitlab_ci_email_from'] = 'gitlab-ci@example.com'
 # gitlab_ci['gitlab_ci_support_email'] = 'gitlab-ci@example.com'