diff --git a/eclipse-cdt.spec b/eclipse-cdt.spec
index 40d1524..f87fc08 100644
--- a/eclipse-cdt.spec
+++ b/eclipse-cdt.spec
@@ -4,17 +4,14 @@
 
 %bcond_with bootstrap
 
-# Change following to 0 to default to no container/remote support when building
+# Change following to 0 to default to no remote support when building
 # for the first time in a buildroot -- this is needed to build:
-#  * eclipse-linuxtools-docker
 #  * eclipse-remote
 # which all make circular dependencies on cdt
 %if %{without bootstrap}
 %global _enable_container_and_remote_support 1
-%global _enable_container_support 1
 %else
 %global _enable_container_and_remote_support 0
-%global _enable_container_support 0
 %endif
 
 Epoch: 2
@@ -39,7 +36,7 @@ Epoch: 2
 Summary:        Eclipse C/C++ Development Tools (CDT) plugin
 Name:           eclipse-cdt
 Version:        9.11.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 License:        EPL-2.0 and CPL
 URL:            https://www.eclipse.org/cdt
 
@@ -79,9 +76,6 @@ BuildRequires: exec-maven-plugin
 BuildRequires: maven-antrun-plugin
 BuildRequires: freemarker
 %if %{_enable_container_and_remote_support}
-%if %{_enable_container_support}
-BuildRequires: eclipse-linuxtools-docker >= 5.3.0
-%endif
 BuildRequires: eclipse-remote >= 2.1.0
 %endif
 
@@ -95,6 +89,8 @@ Requires:      eclipse-remote >= 2.1.0
 # Added in F31
 Obsoletes:     %{name}-tests < 2:9.7.0-4
 Obsoletes:     %{name}-parsers < 2:9.7.0-4
+# Added in F32
+Obsoletes:     %{name}-docker < 2:9.11.0-6
 
 # Added in F32
 Obsoletes: eclipse-launchbar < 1:2.5.0-2
@@ -148,17 +144,6 @@ Requires:       %{name} = %{epoch}:%{version}-%{release}
 Extensions to support Arduino C++ projects in Eclipse.
 %endif
 
-%if %{_enable_container_support}
-%package docker
-Summary:        C/C++ Docker Launcher
-Requires:       %{name} = %{epoch}:%{version}-%{release}
-Requires:       eclipse-linuxtools-docker >= 5.3.0
-
-%description docker
-Special launcher for CDT to allow launching and debugging C/C++ applications
-in Docker Containers.
-%endif
-
 %package qt
 Summary:        QT C++ Tools
 Requires:       %{name} = %{epoch}:%{version}-%{release}
@@ -298,15 +283,17 @@ sed -i -e '/<module>xlc\//d' pom.xml
 %pom_disable_module releng/org.eclipse.cdt.testing
 %pom_disable_module releng/org.eclipse.cdt.testing-feature
 
-# Disable docker, autotools, and remote features if we are building a boot-strap build
+# Don't build and ship docker support
+%pom_disable_module launch/org.eclipse.cdt.docker.launcher
+%pom_disable_module launch/org.eclipse.cdt.docker.launcher-feature
+
+# Disable autotools, and remote features if we are building a boot-strap build
 %if ! %{_enable_container_and_remote_support}
 %pom_disable_module org.eclipse.tm.terminal.connector.remote.feature terminal/features
 %pom_disable_module org.eclipse.tm.terminal.connector.remote terminal/plugins
 %pom_disable_module launchbar/org.eclipse.launchbar.remote
 %pom_disable_module launchbar/org.eclipse.launchbar.remote.core
 %pom_disable_module launchbar/org.eclipse.launchbar.remote.ui
-%pom_disable_module launch/org.eclipse.cdt.docker.launcher
-%pom_disable_module launch/org.eclipse.cdt.docker.launcher-feature
 %pom_disable_module build/org.eclipse.cdt.autotools.core
 %pom_disable_module build/org.eclipse.cdt.autotools.docs
 %pom_disable_module build/org.eclipse.cdt.autotools.ui
@@ -338,10 +325,6 @@ sed -i -e '/<module>xlc\//d' pom.xml
 %pom_disable_module releng/org.eclipse.cdt.sdk
 %pom_disable_module releng/org.eclipse.cdt.sdk-feature
 %else
-%if ! %{_enable_container_support}
-%pom_disable_module launch/org.eclipse.cdt.docker.launcher
-%pom_disable_module launch/org.eclipse.cdt.docker.launcher-feature
-%endif
 # Always disable arduino support on rhel
 %if ! 0%{?fedora}
 %pom_disable_module toolchains/arduino/org.eclipse.cdt.arduino.core
@@ -415,7 +398,6 @@ sed -i -e 's/javax.xml.bind/jaxb-api/' tools.templates/org.eclipse.tools.templat
 %mvn_package ":*.testsrunner*"
 %mvn_package :org.eclipse.tools.templates.*
 %mvn_package :org.eclipse.cdt.arduino* arduino
-%mvn_package :org.eclipse.cdt.docker* docker
 %mvn_package :org.eclipse.tm.terminal* terminal
 %mvn_package ":org.eclipse.cdt.{managedbuilder.llvm,llvm.dsf}*" llvm
 %mvn_package :org.eclipse.cdt.qt* qt
@@ -539,15 +521,12 @@ rm -f %{buildroot}/%{_datadir}/eclipse/droplets/*/plugins/*mail*
 %license releng/org.eclipse.cdt.sdk/epl-v20.html
 %endif
 
-%if %{_enable_container_support}
-
-%files docker -f .mfiles-docker
-%license releng/org.eclipse.cdt.sdk/epl-v20.html
-
-%endif
 %endif
 
 %changelog
+* Wed May 06 2020 Mat Booth <mat.booth@redhat.com> - 2:9.11.0-6
+- Drop docker tooling support
+
 * Thu Mar 26 2020 Mat Booth <mat.booth@redhat.com> - 2:9.11.0-5
 - Fix bootstrap mode