diff --git a/.gitlab/merge_request_templates/Default.md b/.gitlab/merge_request_templates/Default.md
index 477469157..b0c5b8a28 100644
--- a/.gitlab/merge_request_templates/Default.md
+++ b/.gitlab/merge_request_templates/Default.md
@@ -86,7 +86,7 @@ This MR does not require any follow-up.
 
 - [ ] Implementation satisfies specification
 - [ ] Changes confirmed by manual testing
-- [ ] [Code style](https://git.znuny.com/zammad/zammad/-/wikis/Coding-style-guide) is appropriate
+- [ ] [Code style](https://git.zammad.com/zammad/zammad/-/wikis/Coding-style-guide) is appropriate
 - [ ] Performance will not degrade
 - [ ] Code is properly covered with tests
 - If follow-up by the documentation team is needed:
diff --git a/.gitlab/merge_request_templates/new_tech_stack_application_feature.md b/.gitlab/merge_request_templates/new_tech_stack_application_feature.md
index 49b62c4b7..c8c817923 100644
--- a/.gitlab/merge_request_templates/new_tech_stack_application_feature.md
+++ b/.gitlab/merge_request_templates/new_tech_stack_application_feature.md
@@ -19,5 +19,5 @@
 
 - [ ] Implementation satisfies specification
 - [ ] Changes confirmed by manual testing
-- [ ] [Code style](https://git.znuny.com/zammad/zammad/-/wikis/Coding-style-guide) is appropriate
+- [ ] [Code style](https://git.zammad.com/zammad/zammad/-/wikis/Coding-style-guide) is appropriate
 - [ ] Code is properly covered with tests
diff --git a/.gitlab/merge_request_templates/new_tech_stack_core_feature.md b/.gitlab/merge_request_templates/new_tech_stack_core_feature.md
index 2f8cec1cc..e3ba0d94b 100644
--- a/.gitlab/merge_request_templates/new_tech_stack_core_feature.md
+++ b/.gitlab/merge_request_templates/new_tech_stack_core_feature.md
@@ -13,5 +13,5 @@
 
 - [ ] Implementation satisfies specification
 - [ ] Changes confirmed by manual testing
-- [ ] [Code style](https://git.znuny.com/zammad/zammad/-/wikis/Coding-style-guide) is appropriate
+- [ ] [Code style](https://git.zammad.com/zammad/zammad/-/wikis/Coding-style-guide) is appropriate
 - [ ] Code is properly covered with tests
diff --git a/Gemfile b/Gemfile
index 8c3226e5f..b785b0b2e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -239,5 +239,5 @@ end
 #               without having your changes overwritten during upgrades.)
 # ZAMMAD DEVS:  Consult the internal wiki
 #               (or else risk pushing unwanted changes to Gemfile.lock!)
-#               https://git.znuny.com/zammad/zammad/wikis/Tips#user-content-customizing-the-gemfile
+#               https://git.zammad.com/zammad/zammad/wikis/Tips#user-content-customizing-the-gemfile
 eval_gemfile 'Gemfile.local' if File.exist?('Gemfile.local')
diff --git a/spec/models/channel/driver/twitter_spec.rb b/spec/models/channel/driver/twitter_spec.rb
index d6ceda5da..f19ff07d4 100644
--- a/spec/models/channel/driver/twitter_spec.rb
+++ b/spec/models/channel/driver/twitter_spec.rb
@@ -15,7 +15,7 @@ RSpec.describe Channel::Driver::Twitter, required_envs: %w[TWITTER_CONSUMER_KEY
 
     let(:payload) { YAML.safe_load(File.read(payload_file), [ActiveSupport::HashWithIndifferentAccess]) }
 
-    # https://git.znuny.com/zammad/zammad/-/issues/305
+    # https://git.zammad.com/zammad/zammad/-/issues/305
     shared_examples 'for user processing' do
       let(:sender_attributes) do
         {
diff --git a/test/unit/user_assets_test.rb b/test/unit/user_assets_test.rb
index 7fe5cc95b..da049f853 100644
--- a/test/unit/user_assets_test.rb
+++ b/test/unit/user_assets_test.rb
@@ -10,7 +10,7 @@
 # see lines 75:83:91:109:123:131:139 of this file).
 #
 # This omission is discussed in detail in
-# https://git.znuny.com/zammad/zammad/merge_requests/363
+# https://git.zammad.com/zammad/zammad/merge_requests/363
 
 require 'test_helper'