diff --git a/compose/config/config.py b/compose/config/config.py
index 9af40289706..df98dcb490c 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -91,6 +91,7 @@
     'mem_swappiness',
     'net',
     'oom_score_adj',
+    'oom_kill_disable',
     'pid',
     'ports',
     'privileged',
diff --git a/compose/config/config_schema_v2.1.json b/compose/config/config_schema_v2.1.json
index 24e6ba02cea..6b74f0ed699 100644
--- a/compose/config/config_schema_v2.1.json
+++ b/compose/config/config_schema_v2.1.json
@@ -229,6 +229,7 @@
             }
           ]
         },
+        "oom_kill_disable": {"type": "boolean"},
         "oom_score_adj": {"type": "integer", "minimum": -1000, "maximum": 1000},
         "group_add": {
             "type": "array",
diff --git a/compose/config/config_schema_v2.2.json b/compose/config/config_schema_v2.2.json
index 86fc5df95d1..21343b8932c 100644
--- a/compose/config/config_schema_v2.2.json
+++ b/compose/config/config_schema_v2.2.json
@@ -235,6 +235,7 @@
             }
           ]
         },
+        "oom_kill_disable": {"type": "boolean"},
         "oom_score_adj": {"type": "integer", "minimum": -1000, "maximum": 1000},
         "group_add": {
             "type": "array",
diff --git a/compose/config/config_schema_v2.3.json b/compose/config/config_schema_v2.3.json
index ceaf44954eb..0e709e9d93b 100644
--- a/compose/config/config_schema_v2.3.json
+++ b/compose/config/config_schema_v2.3.json
@@ -237,6 +237,7 @@
             }
           ]
         },
+        "oom_kill_disable": {"type": "boolean"},
         "oom_score_adj": {"type": "integer", "minimum": -1000, "maximum": 1000},
         "group_add": {
             "type": "array",
diff --git a/compose/config/interpolation.py b/compose/config/interpolation.py
index 9d7e428c9bd..45a5f9fc232 100644
--- a/compose/config/interpolation.py
+++ b/compose/config/interpolation.py
@@ -156,6 +156,7 @@ class ConversionMap(object):
         service_path('deploy', 'update_config', 'max_failure_ratio'): float,
         service_path('deploy', 'restart_policy', 'max_attempts'): to_int,
         service_path('mem_swappiness'): to_int,
+        service_path('oom_kill_disable'): to_boolean,
         service_path('oom_score_adj'): to_int,
         service_path('ports', 'target'): to_int,
         service_path('ports', 'published'): to_int,
diff --git a/compose/service.py b/compose/service.py
index d5be740dfac..6a5fd8fc188 100644
--- a/compose/service.py
+++ b/compose/service.py
@@ -77,6 +77,7 @@
     'mem_reservation',
     'memswap_limit',
     'mem_swappiness',
+    'oom_kill_disable',
     'oom_score_adj',
     'pid',
     'pids_limit',
@@ -859,6 +860,7 @@ def _get_container_host_config(self, override_options, one_off=False):
             sysctls=options.get('sysctls'),
             pids_limit=options.get('pids_limit'),
             tmpfs=options.get('tmpfs'),
+            oom_kill_disable=options.get('oom_kill_disable'),
             oom_score_adj=options.get('oom_score_adj'),
             mem_swappiness=options.get('mem_swappiness'),
             group_add=options.get('group_add'),
diff --git a/tests/integration/service_test.py b/tests/integration/service_test.py
index 84b54fe419d..1f5d22f6125 100644
--- a/tests/integration/service_test.py
+++ b/tests/integration/service_test.py
@@ -239,8 +239,7 @@ def test_create_container_with_security_opt(self):
         service.start_container(container)
         self.assertEqual(set(container.get('HostConfig.SecurityOpt')), set(security_opt))
 
-    # @pytest.mark.xfail(True, reason='Not supported on most drivers')
-    @pytest.mark.skipif(True, reason='https://github.com/moby/moby/issues/34270')
+    @pytest.mark.xfail(True, reason='Not supported on most drivers')
     def test_create_container_with_storage_opt(self):
         storage_opt = {'size': '1G'}
         service = self.create_service('db', storage_opt=storage_opt)
@@ -248,6 +247,12 @@ def test_create_container_with_storage_opt(self):
         service.start_container(container)
         self.assertEqual(container.get('HostConfig.StorageOpt'), storage_opt)
 
+    def test_create_container_with_oom_kill_disable(self):
+        self.require_api_version('1.20')
+        service = self.create_service('db', oom_kill_disable=True)
+        container = service.create_container()
+        assert container.get('HostConfig.OomKillDisable') is True
+
     def test_create_container_with_mac_address(self):
         service = self.create_service('db', mac_address='02:42:ac:11:65:43')
         container = service.create_container()