diff --git a/app/settings.py b/app/settings.py
index 363c14cf69a8e68c935aa03ba7be92f13d04ab83..d1247e2ad9ce3b02557238b9bd31b4f85a3b5645 100644
--- a/app/settings.py
+++ b/app/settings.py
@@ -68,11 +68,13 @@ MAC_OUI = '02:42:42'
 DOCUMENTATION_URL = 'http://ics-infrastructure.pages.esss.lu.se/csentry/index.html'
 
 # AWX job templates
-AWX_JOB_ENABLED = False
 AWX_CORE_SERVICES_UPDATE = 'ics-ans-core @ DHCP test'
 AWX_CREATE_VM = 'ics-ans-deploy-proxmox-vm'
 AWX_CREATE_VIOC = 'ics-ans-deploy-vioc'
 
+AWX_JOB_ENABLED = False
+AWX_VM_CREATION_ENABLED = False
+
 VM_CORES_CHOICES = [1, 2, 4, 6, 8, 24]
 VM_MEMORY_CHOICES = [2, 4, 8, 16, 32, 128]
 VM_DEFAULT_DNS = '172.16.6.21'
diff --git a/app/tasks.py b/app/tasks.py
index 92d71d1e21001152753f2d32750921c761a046a3..bea8ce4b4caa105df3625fa3f256568f0424c033 100644
--- a/app/tasks.py
+++ b/app/tasks.py
@@ -72,6 +72,10 @@ def trigger_core_services_update():
 
 
 def launch_job_template(job_template, monitor=True, **kwargs):
+    if (job_template in (current_app.config['AWX_CREATE_VIOC'], current_app.config['AWX_CREATE_VM']) and
+            not current_app.config.get('AWX_VM_CREATION_ENABLED', False)):
+        current_app.logger.info('AWX VM creation is disabled. Not sending any request.')
+        return 'AWX VM creation not triggered'
     if not current_app.config.get('AWX_JOB_ENABLED', False):
         current_app.logger.info('AWX job is disabled. Not sending any request.')
         return 'AWX job not triggered'