diff --git a/manifests/cvemap_downloader.pp b/manifests/cvemap_downloader.pp
index 3b03a65..0353cb7 100644
--- a/manifests/cvemap_downloader.pp
+++ b/manifests/cvemap_downloader.pp
@@ -16,7 +16,6 @@
   String $timer_interval = '24h',
 ) {
   include iop::core_gateway
-  include iop::service_vmaas
 
   $script_path = '/usr/local/bin/iop-cvemap-download.sh'
   $basedir = '/var/www/html/pub'
diff --git a/manifests/service_vmaas.pp b/manifests/service_vmaas.pp
index b559dc6..2fe056b 100644
--- a/manifests/service_vmaas.pp
+++ b/manifests/service_vmaas.pp
@@ -32,9 +32,12 @@
   include iop::core_kafka
   include iop::core_gateway
   include iop::database
-  include iop::cvemap_downloader
   include certs::iop
 
+  class { 'iop::cvemap_downloader':
+    ensure => $ensure,
+  }
+
   $service_name = 'iop-service-vmaas-reposcan'
   $client_ca_cert_secret_name = "${service_name}-client-ca-cert"
   $database_username_secret_name = "${service_name}-database-username"
diff --git a/spec/acceptance/service_vmaas_spec.rb b/spec/acceptance/service_vmaas_spec.rb
index c462645..ba98376 100644
--- a/spec/acceptance/service_vmaas_spec.rb
+++ b/spec/acceptance/service_vmaas_spec.rb
@@ -34,6 +34,21 @@ class { 'iop::service_vmaas': }
     describe command("podman run --rm --network=iop-core-network quay.io/iop/vmaas curl -s -o /dev/null -w '%{http_code}' http://iop-service-vmaas-reposcan:8000/healthz") do
       its(:stdout) { should match /200/ }
     end
+
+    describe service('iop-cvemap-download.timer') do
+      it { is_expected.to be_enabled }
+      it { is_expected.to be_running }
+    end
+
+    describe service('iop-cvemap-download.path') do
+      it { is_expected.to be_enabled }
+      it { is_expected.to be_running }
+    end
+
+    describe file('/usr/local/bin/iop-cvemap-download.sh') do
+      it { is_expected.to be_file }
+      it { is_expected.to be_executable }
+    end
   end
 
   context 'with ensure => absent' do
@@ -74,5 +89,31 @@ class { 'iop::service_vmaas':
       its(:exit_status) { should eq 1 }
       its(:stdout) { should be_empty }
     end
+
+    describe service('iop-cvemap-download.timer') do
+      it { is_expected.not_to be_running }
+      it { is_expected.not_to be_enabled }
+    end
+
+    describe service('iop-cvemap-download.path') do
+      it { is_expected.not_to be_running }
+      it { is_expected.not_to be_enabled }
+    end
+
+    describe file('/usr/local/bin/iop-cvemap-download.sh') do
+      it { is_expected.not_to exist }
+    end
+
+    describe file('/etc/systemd/system/iop-cvemap-download.service') do
+      it { is_expected.not_to exist }
+    end
+
+    describe file('/etc/systemd/system/iop-cvemap-download.timer') do
+      it { is_expected.not_to exist }
+    end
+
+    describe file('/etc/systemd/system/iop-cvemap-download.path') do
+      it { is_expected.not_to exist }
+    end
   end
 end