diff --git a/REFERENCE.md b/REFERENCE.md
index 6531cf6c..0678e9c6 100644
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -3065,11 +3065,11 @@ Default value: `undef`
 
 ##### <a name="-docker--run--memory_limit"></a>`memory_limit`
 
-Data type: `Pattern[/^[\d]*(b|k|m|g)$/]`
+Data type: `Optional[Pattern[/^[\d]*(b|k|m|g)$/]]`
 
 
 
-Default value: `'0b'`
+Default value: `undef`
 
 ##### <a name="-docker--run--cpuset"></a>`cpuset`
 
diff --git a/manifests/repos.pp b/manifests/repos.pp
index b6c6a7a3..68d6edc5 100644
--- a/manifests/repos.pp
+++ b/manifests/repos.pp
@@ -23,7 +23,14 @@
       $package_repos = $docker::package_repos
 
       if ($docker::use_upstream_package_source) {
+
+        # https://swarmfarm.atlassian.net/browse/CS-14235
+        # We are removing docker from being a self-managed source here,
+        # But this module is a bit poorly written for our purposes
+        # This is a hardcoding of removal of this element to clean up all machines with this in the fleet
+        $_swarmfarm_docker_remove_apt_source = 'absent'
         apt::source { 'docker':
+          ensure       => $_swarmfarm_docker_remove_apt_source,
           location     => $location,
           architecture => $architecture,
           release      => $release,
diff --git a/manifests/run.pp b/manifests/run.pp
index 535d6efe..dd5275aa 100644
--- a/manifests/run.pp
+++ b/manifests/run.pp
@@ -21,9 +21,9 @@
 # puppet help.
 #
 # @param verify_digest
-#   (optional) Make sure, that the image has not modified. Compares the digest 
+#   (optional) Make sure, that the image has not modified. Compares the digest
 #   checksum before starting the docker image.
-#   To get the digest of an image, run the following command: 
+#   To get the digest of an image, run the following command:
 #     docker image inspect <<image>> --format='{{index .RepoDigests 0}}
 #
 # @param service_prefix
@@ -196,7 +196,7 @@
   Enum[present,absent]                      $ensure                            = 'present',
   Optional[String]                          $verify_digest                     = undef,
   Optional[String]                          $command                           = undef,
-  Pattern[/^[\d]*(b|k|m|g)$/]               $memory_limit                      = '0b',
+  Optional[Pattern[/^[\d]*(b|k|m|g)$/]]     $memory_limit                      = undef,
   Variant[String,Array,Undef]               $cpuset                            = [],
   Variant[String,Array,Undef]               $ports                             = [],
   Variant[String,Array,Undef]               $labels                            = [],
diff --git a/spec/defines/run_spec.rb b/spec/defines/run_spec.rb
index 4d27df89..aba748bd 100644
--- a/spec/defines/run_spec.rb
+++ b/spec/defines/run_spec.rb
@@ -288,7 +288,7 @@
             'links' => [],
             'lxc_conf' => [],
             'manage_service' => true,
-            'memory_limit' => '0b',
+            'memory_limit' => :undef,
             'net' => 'bridge',
             'ports' => [],
             'privileged' => false,