diff --git a/app/models/job.rb b/app/models/job.rb
index 0bf00ebaec9..df1461076f4 100644
--- a/app/models/job.rb
+++ b/app/models/job.rb
@@ -178,6 +178,9 @@ def timeout_adjustment
     if target.kind_of?(ManageIQ::Providers::Microsoft::InfraManager::Vm) ||
        target.kind_of?(ManageIQ::Providers::Microsoft::InfraManager::Template)
       timeout_adjustment = 4
+    elsif target.kind_of?(ManageIQ::Providers::Azure::CloudManager::Vm) ||
+          target.kind_of?(ManageIQ::Providers::Azure::CloudManager::Template)
+      timeout_adjustment = 4
     end
     timeout_adjustment
   end
diff --git a/app/models/miq_server/server_smart_proxy.rb b/app/models/miq_server/server_smart_proxy.rb
index 051e22e8002..e6a57a2e6c6 100644
--- a/app/models/miq_server/server_smart_proxy.rb
+++ b/app/models/miq_server/server_smart_proxy.rb
@@ -82,6 +82,9 @@ def queue_call(ost)
         if target.kind_of?(ManageIQ::Providers::Openstack::CloudManager::Vm) ||
            target.kind_of?(ManageIQ::Providers::Openstack::CloudManager::Template)
           timeout_adj = 4
+        elsif target.kind_of?(ManageIQ::Providers::Azure::CloudManager::Vm) ||
+              target.kind_of?(ManageIQ::Providers::Azure::CloudManager::Template)
+          timeout_adj = 4
         elsif target.kind_of?(ManageIQ::Providers::Microsoft::InfraManager::Vm) ||
               target.kind_of?(ManageIQ::Providers::Microsoft::InfraManager::Template)
           timeout_adj = 8
diff --git a/config/settings.yml b/config/settings.yml
index b7d890e59a9..2d3f4d3b3ce 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -1129,9 +1129,9 @@
         :nice_delta: 7
       :smart_proxy_worker:
         :count: 2
-        :memory_threshold: 600.megabytes
+        :memory_threshold: 2.gigabytes
         :queue_timeout: 20.minutes
-        :restart_interval: 2.hours
+        :restart_interval: 6.hours
     :schedule_worker:
       :container_entities_purge_interval: 1.day
       :authentication_check_interval: 1.hour