diff --git a/resources/attributes/default.rb b/resources/attributes/default.rb
index 69da177..e1e8c45 100644
--- a/resources/attributes/default.rb
+++ b/resources/attributes/default.rb
@@ -43,6 +43,10 @@
 default['redis']['port'] = 26379
 default['redis']['sentinel_port'] = 26380
 
+# airflow
+default['airflow']['web_port'] = 9191
+default['airflow']['scheduler_port'] = 8793
+
 # aerospike
 default['aerospike']['port'] = 3000
 default['aerospike']['multicast'] = '239.1.99.222'
@@ -87,6 +91,8 @@
 default['redborder']['memory_services']['secor'] = { 'count': 30, 'memory': 0 }
 default['redborder']['memory_services']['secor-vault'] = { 'count': 30, 'memory': 0 }
 default['redborder']['memory_services']['redis'] = { 'count': 10, 'memory': 0 }
+default['redborder']['memory_services']['airflow-scheduler'] = { 'count': 30, 'memory': 0 }
+default['redborder']['memory_services']['airflow-webserver'] = { 'count': 30, 'memory': 0 }
 default['redborder']['memory_services']['rb-reputation'] = { 'count': 30, 'memory': 0 }
 
 # default attributes for managers_info, it would be rewriten with the cluster config
@@ -169,6 +175,8 @@
 default['redborder']['services']['secor']                     = false
 default['redborder']['services']['secor-vault']               = false
 default['redborder']['services']['redis']                     = false
+default['redborder']['services']['airflow-scheduler']         = false
+default['redborder']['services']['airflow-webserver']         = false
 default['redborder']['services']['rb-reputation']             = false
 
 default['redborder']['systemdservices']['aerospike']                = ['aerospike']
@@ -218,6 +226,8 @@
 default['redborder']['systemdservices']['secor']                    = ['rb-secor']
 default['redborder']['systemdservices']['secor-vault']              = ['rb-secor-vault']
 default['redborder']['systemdservices']['redis']                    = ['redis']
+default['redborder']['systemdservices']['airflow-scheduler']        = ['airflow-scheduler']
+default['redborder']['systemdservices']['airflow-webserver']        = ['airflow-webserver']
 default['redborder']['systemdservices']['rb-reputation']            = ['rb-reputation']
 
 # Balanced services
diff --git a/resources/metadata.rb b/resources/metadata.rb
index c25a9ca..c91c11e 100644
--- a/resources/metadata.rb
+++ b/resources/metadata.rb
@@ -51,4 +51,5 @@
 depends 'secor'
 depends 'redis'
 depends 'rb-agents'
+depends 'airflow'
 depends 'rb-reputation'
diff --git a/resources/recipes/configure.rb b/resources/recipes/configure.rb
index c288b06..83b7262 100644
--- a/resources/recipes/configure.rb
+++ b/resources/recipes/configure.rb
@@ -531,6 +531,28 @@
   action [:add]
 end
 
+airflow_secrets = {}
+
+begin
+  airflow_secrets = data_bag_item('passwords', 'db_airflow').to_hash
+rescue
+  airflow_secrets = {}
+end
+
+# Configure Airflow
+airflow_config 'Configure airflow' do
+  if manager_services['airflow-scheduler'] || manager_services['airflow-webserver']
+    airflow_secrets airflow_secrets
+    ipaddress_mgt node['ipaddress']
+    ipaddress_sync node['ipaddress_sync']
+    airflow_port node['airflow']['web_port']
+    cdomain node['redborder']['cdomain']
+    action [:add, :register]
+  else
+    action [:remove, :deregister]
+  end
+end
+
 # Configure logstash
 split_traffic = false