diff --git a/data/Debian/Ubuntu/common.yaml b/data/Debian/Ubuntu/common.yaml
index c30c2b4..a458182 100644
--- a/data/Debian/Ubuntu/common.yaml
+++ b/data/Debian/Ubuntu/common.yaml
@@ -6,7 +6,7 @@ icinga::repos:
     location: http://packages.icinga.com/ubuntu
   'icinga-snapshot-builds':
     location: http://packages.icinga.com/ubuntu
-  'netways-plugins':
+  'netways-plugins-release':
     location: http://packages.netways.de/plugins/ubuntu
-  'netways-extras':
+  'netways-extras-release':
     location: http://packages.netways.de/extras/ubuntu
diff --git a/data/Debian/common.yaml b/data/Debian/common.yaml
index 5322f5b..1d80cb1 100644
--- a/data/Debian/common.yaml
+++ b/data/Debian/common.yaml
@@ -21,14 +21,14 @@ icinga::repos:
     key: 
       id: F51A91A5EE001AA5D77D53C4C6E319C334410682
       source: http://packages.icinga.com/icinga.key
-  'netways-plugins':
+  'netways-plugins-release':
     location: http://packages.netways.de/plugins/debian
     release: '%{facts.os.distro.codename}'
     repos: main
     key:
       id: 0DEE49417F457646CC0C29AD03E3F1C5E8B2FC5E
       source: https://packages.netways.de/netways-repo.asc
-  'netways-extras':
+  'netways-extras-release':
     location: http://packages.netways.de/extras/debian
     release: '%{facts.os.distro.codename}'
     repos: main
diff --git a/data/RedHat/common.yaml b/data/RedHat/common.yaml
index ac9d539..49a1970 100644
--- a/data/RedHat/common.yaml
+++ b/data/RedHat/common.yaml
@@ -20,13 +20,13 @@ icinga::repos:
     gpgcheck: 1
     gpgkey: https://packages.icinga.com/icinga.key
     metadata_expire: 1d
-  netways-plugins:
+  netways-plugins-release:
     descr: NETWAYS plugins provide some monitoring plugins - Enterprise Linux
     baseurl: 'https://packages.netways.de/plugins/epel/$releasever'
     enabled: 1
     gpgcheck: 1
     gpgkey: https://packages.netways.de/netways-repo.asc
-  netways-extras:
+  netways-extras-release:
     descr: NETWAYS extras provide monitoring extras - Enterprise Linux
     baseurl: 'https://packages.netways.de/extras/epel/$releasever'
     enabled: 1
diff --git a/manifests/repos.pp b/manifests/repos.pp
index 9825ea4..b434f29 100644
--- a/manifests/repos.pp
+++ b/manifests/repos.pp
@@ -42,12 +42,12 @@
 
   $list    =  lookup('icinga::repos', Hash, 'deep', {})
   $managed = {
-    icinga-stable-release  => $manage_stable,
-    icinga-testing-builds  => $manage_testing,
-    icinga-snapshot-builds => $manage_nightly,
-    epel                   => $manage_epel,
-    netways-plugins        => $manage_plugins,
-    netways-extras         => $manage_extras,
+    icinga-stable-release   => $manage_stable,
+    icinga-testing-builds   => $manage_testing,
+    icinga-snapshot-builds  => $manage_nightly,
+    epel                    => $manage_epel,
+    netways-plugins-release => $manage_plugins,
+    netways-extras-release  => $manage_extras,
   }
 
   case $::facts['os']['family'] {
diff --git a/manifests/repos/apt.pp b/manifests/repos/apt.pp
index 75a6fe9..5f8f4fa 100644
--- a/manifests/repos/apt.pp
+++ b/manifests/repos/apt.pp
@@ -19,8 +19,8 @@
     Apt::Source['backports'] -> Package <| |>
   }
 
-  # fix issue 21
-  file { ['/etc/apt/sources.list.d/netways-plugins-release.list', '/etc/apt/sources.list.d/netways-extras-release.list']:
+  # fix issue 21, 33
+  file { ['/etc/apt/sources.list.d/netways-plugins.list', '/etc/apt/sources.list.d/netways-extras.list']:
     ensure => 'absent',
   }
 
@@ -29,7 +29,7 @@
       Apt::Source[$repo_name] -> Package <| |>
       apt::source { $repo_name:
         *       =>  merge({ ensure => present }, $repo_config),
-        require => File['/etc/apt/sources.list.d/netways-plugins-release.list', '/etc/apt/sources.list.d/netways-extras-release.list'],
+        require => File['/etc/apt/sources.list.d/netways-plugins.list', '/etc/apt/sources.list.d/netways-extras.list'],
       }
     }
   }
diff --git a/manifests/repos/yum.pp b/manifests/repos/yum.pp
index c921301..da92521 100644
--- a/manifests/repos/yum.pp
+++ b/manifests/repos/yum.pp
@@ -15,8 +15,8 @@
     warning("Repository EPEL isn't available on ${facts['os']['name']} ${facts['os']['release']['major']}.")
   }
 
-  # fix issue 21
-  file { ['/etc/yum.repos.d/netways-plugins-release.repo', '/etc/yum.repos.d/netways-extras-release.repo']:
+  # fix issue 21, 33
+  file { ['/etc/yum.repos.d/netways-plugins.repo', '/etc/yum.repos.d/netways-extras.repo']:
     ensure => 'absent',
   }
 
@@ -25,7 +25,7 @@
       Yumrepo[$repo_name] -> Package <| |>
       yumrepo { $repo_name:
         *       =>  $repo_config,
-        require => File['/etc/yum.repos.d/netways-plugins-release.repo', '/etc/yum.repos.d/netways-extras-release.repo'],
+        require => File['/etc/yum.repos.d/netways-plugins.repo', '/etc/yum.repos.d/netways-extras.repo'],
       }
     }
   }
diff --git a/manifests/repos/zypper.pp b/manifests/repos/zypper.pp
index 77533e8..a5ab166 100644
--- a/manifests/repos/zypper.pp
+++ b/manifests/repos/zypper.pp
@@ -10,8 +10,8 @@
   $repos   = $::icinga::repos::list
   $managed = $::icinga::repos::managed
 
-  # fix issue 21
-  file { ['/etc/zypp/repos.d/netways-plugins-release.repo', '/etc/zypp/repos.d/netways-extras-release.repo']:
+  # fix issue 21, 33
+  file { ['/etc/zypp/repos.d/netways-plugins.repo', '/etc/zypp/repos.d/netways-extras.repo']:
     ensure => 'absent',
   }
 
@@ -32,7 +32,7 @@
 
       -> zypprepo { $repo_name:
         *       => delete($repo_config, 'proxy'),
-        require => File['/etc/zypp/repos.d/netways-plugins-release.repo', '/etc/zypp/repos.d/netways-extras-release.repo'],
+        require => File['/etc/zypp/repos.d/netways-plugins.repo', '/etc/zypp/repos.d/netways-extras.repo'],
       }
 
       -> file_line { "add proxy settings to ${repo_name}":
diff --git a/spec/classes/repos_spec.rb b/spec/classes/repos_spec.rb
index 091b2a3..b508fae 100644
--- a/spec/classes/repos_spec.rb
+++ b/spec/classes/repos_spec.rb
@@ -60,11 +60,11 @@
         when 'Debian'
           it { is_expected.not_to contain_apt__source('icinga-stable-release') }
           it { is_expected.to contain_apt__source('icinga-testing-builds').with('ensure' => 'present') }
-          it { is_expected.to contain_apt__source('netways-plugins').with('ensure' => 'present') }
+          it { is_expected.to contain_apt__source('netways-plugins-release').with('ensure' => 'present') }
         when 'RedHat'
           it { is_expected.not_to contain_yumrepo('icinga-stable-release') }
           it { is_expected.to contain_yumrepo('icinga-testing-builds').with('enabled' => 1) }
-          it { is_expected.to contain_yumrepo('netways-plugins').with('enabled' => 1) }
+          it { is_expected.to contain_yumrepo('netways-plugins-release').with('enabled' => 1) }
         when 'Suse'
           it { is_expected.not_to contain_zypprepo('icinga-stable-release') }
           it { is_expected.to contain_zypprepo('icinga-testing-builds').with('enabled' => 1) }
@@ -78,11 +78,11 @@
         when 'Debian'
           it { is_expected.not_to contain_apt__source('icinga-stable-release') }
           it { is_expected.to contain_apt__source('icinga-snapshot-builds').with('ensure' => 'present') }
-          it { is_expected.to contain_apt__source('netways-extras').with('ensure' => 'present') }
+          it { is_expected.to contain_apt__source('netways-extras-release').with('ensure' => 'present') }
         when 'RedHat'
           it { is_expected.not_to contain_yumrepo('icinga-stable-release') }
           it { is_expected.to contain_yumrepo('icinga-snapshot-builds').with('enabled' => 1) }
-          it { is_expected.to contain_yumrepo('netways-extras').with('enabled' => 1) }
+          it { is_expected.to contain_yumrepo('netways-extras-release').with('enabled' => 1) }
         when 'Suse'
           it { is_expected.not_to contain_zypprepo('icinga-stable-release') }
           it { is_expected.to contain_zypprepo('icinga-snapshot-builds').with('enabled' => 1) }