diff --git a/manifests/params.pp b/manifests/params.pp
index 86984dd9..c759193e 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -108,28 +108,16 @@
         'Ubuntu' : {
           $package_release = "ubuntu-${facts['os']['distro']['codename']}"
 
-          if (versioncmp($facts['os']['release']['full'], '15.04') >= 0) {
-            $service_after_override     = undef
-            $service_config_template    = 'docker/etc/sysconfig/docker.systemd.epp'
-            $service_hasrestart         = true
-            $service_hasstatus          = true
-            $service_overrides_template = 'docker/etc/systemd/system/docker.service.d/service-overrides-debian.conf.epp'
-            $service_provider           = 'systemd'
-            $socket_override            = false
-            $socket_overrides_template  = 'docker/etc/systemd/system/docker.socket.d/socket-overrides.conf.epp'
-            $storage_config             = '/etc/default/docker-storage'
-            include docker::systemd_reload
-          } else {
-            $service_config_template    = 'docker/etc/default/docker.epp'
-            $service_overrides_template = undef
-            $socket_overrides_template  = undef
-            $socket_override            = false
-            $service_after_override     = undef
-            $service_provider           = 'upstart'
-            $service_hasstatus          = true
-            $service_hasrestart         = false
-            $storage_config             = undef
-          }
+          $service_after_override     = undef
+          $service_config_template    = 'docker/etc/sysconfig/docker.systemd.epp'
+          $service_hasrestart         = true
+          $service_hasstatus          = true
+          $service_overrides_template = 'docker/etc/systemd/system/docker.service.d/service-overrides-debian.conf.epp'
+          $service_provider           = 'systemd'
+          $socket_override            = false
+          $socket_overrides_template  = 'docker/etc/systemd/system/docker.socket.d/socket-overrides.conf.epp'
+          $storage_config             = '/etc/default/docker-storage'
+          include docker::systemd_reload
         }
         default: {
           if (versioncmp($facts['facterversion'], '2.4.6') <= 0) {
diff --git a/manifests/run.pp b/manifests/run.pp
index 535d6efe..bc5199f8 100644
--- a/manifests/run.pp
+++ b/manifests/run.pp
@@ -516,15 +516,6 @@
         $mode               = '0644'
         $hasstatus          = true
       }
-      'upstart': {
-        $initscript         = "/etc/init.d/${service_prefix}${sanitised_title}"
-        $init_template      = 'docker/etc/init.d/docker-run.epp'
-        $mode               = '0750'
-        $startscript        = undef
-        $stopscript         = undef
-        $startstop_template = undef
-        $hasstatus          = true
-      }
       default: {
         if $facts['os']['family'] != 'windows' {
           fail('Docker needs a Debian or RedHat based system.')
@@ -617,33 +608,20 @@
         }
       }
 
-      if $service_provider_real == 'systemd' {
-        $init_template_parameters = {
-          'depend_services_array'     => $depend_services_array,
-          'sanitised_after_array'     => $sanitised_after_array,
-          'service_prefix'            => $service_prefix,
-          'sanitised_depends_array'   => $sanitised_depends_array,
-          'title'                     => $title,
-          'have_systemd_v230'         => $docker::params::have_systemd_v230,
-          'extra_systemd_parameters'  => $extra_systemd_parameters,
-          'systemd_restart'           => $systemd_restart,
-          '_syslog_identifier'        => $_syslog_identifier,
-          'syslog_facility'           => $syslog_facility,
-          'sanitised_title'           => $sanitised_title,
-          'remain_after_exit'         => $remain_after_exit,
-          'service_name'              => $service_name,
-        }
-      } elsif $service_provider_real == 'upstart' {
-        $init_template_parameters = {
-          'sanitised_after_array'   => $sanitised_after_array,
-          'service_prefix'          => $service_prefix,
-          'sanitised_depends_array' => $sanitised_depends_array,
-          'depend_services_array'   => $depend_services_array,
-          'docker_command'          => $docker_command,
-          'sanitised_title'         => $sanitised_title,
-          'docker_run_inline_start' => $docker_run_inline_start,
-          'docker_run_inline_stop'  => $docker_run_inline_stop,
-        }
+      $init_template_parameters = {
+        'depend_services_array'     => $depend_services_array,
+        'sanitised_after_array'     => $sanitised_after_array,
+        'service_prefix'            => $service_prefix,
+        'sanitised_depends_array'   => $sanitised_depends_array,
+        'title'                     => $title,
+        'have_systemd_v230'         => $docker::params::have_systemd_v230,
+        'extra_systemd_parameters'  => $extra_systemd_parameters,
+        'systemd_restart'           => $systemd_restart,
+        '_syslog_identifier'        => $_syslog_identifier,
+        'syslog_facility'           => $syslog_facility,
+        'sanitised_title'           => $sanitised_title,
+        'remain_after_exit'         => $remain_after_exit,
+        'service_name'              => $service_name,
       }
 
       file { $initscript:
diff --git a/manifests/service.pp b/manifests/service.pp
index 80c429b7..8b3047b4 100644
--- a/manifests/service.pp
+++ b/manifests/service.pp
@@ -367,14 +367,6 @@
         refreshonly => true,
       }
     }
-    'upstart': {
-      file { '/etc/init.d/docker':
-        ensure => 'link',
-        target => '/lib/init/upstart-job',
-        force  => true,
-        notify => $_manage_service,
-      }
-    }
     default: {}
   }
 
diff --git a/spec/defines/run_spec.rb b/spec/defines/run_spec.rb
index 4d27df89..16f13722 100644
--- a/spec/defines/run_spec.rb
+++ b/spec/defines/run_spec.rb
@@ -363,7 +363,7 @@ class { 'docker':
                                     params['service_provider']
                                   end
 
-          if !params['service_provider_real'] == 'systemd' && !params['service_provider_real'] == 'upstart'
+          if !params['service_provider_real'] == 'systemd'
             if facts[:os]['family'] != 'windows'
               it {
                 expect(subject).to compile.and_raise_error('Docker needs a Debian or RedHat based system.')
diff --git a/spec/shared_examples/run.rb b/spec/shared_examples/run.rb
index 75faecdb..8995aaca 100644
--- a/spec/shared_examples/run.rb
+++ b/spec/shared_examples/run.rb
@@ -156,13 +156,6 @@
       mode               = '0644'
       startscript        = "/usr/local/bin/docker-run-#{sanitised_title}-start.sh"
       stopscript         = "/usr/local/bin/docker-run-#{sanitised_title}-stop.sh"
-    when 'upstart'
-      hasstatus          = true
-      initscript         = "/etc/init.d/#{service_prefix}#{sanitised_title}"
-      mode               = '0750'
-      startscript        = nil
-      stopscript         = nil
-    else
       hasstatus = defaults['service_hasstatus']
     end
 
diff --git a/spec/shared_examples/service.rb b/spec/shared_examples/service.rb
index dce78e78..b7d47422 100644
--- a/spec/shared_examples/service.rb
+++ b/spec/shared_examples/service.rb
@@ -87,16 +87,6 @@
         manage_service,
       )
     }
-  when 'upstart'
-    it {
-      expect(subject).to contain_file('/etc/init.d/docker').with(
-        'ensure' => 'link',
-        'target' => '/lib/init/upstart-job',
-        'force' => true,
-      ).that_notifies(
-        manage_service,
-      )
-    }
   end
 
   if params['storage_config'] != :undef
diff --git a/templates/etc/default/docker.epp b/templates/etc/default/docker.epp
deleted file mode 100644
index b8c3bf0e..00000000
--- a/templates/etc/default/docker.epp
+++ /dev/null
@@ -1,70 +0,0 @@
-# Docker Upstart and SysVinit configuration file
-#
-# THIS FILE IS MANAGED BY PUPPET. Changes will be overwritten.
-
-# # Customize location of Docker binary (especially for development testing).
-DOCKER="/usr/bin/<%= $docker_command %>"
-
-# # If you need Docker to use an HTTP proxy, it can also be specified here.
-<% if $proxy { -%>
-export http_proxy='<%= $proxy %>'
-export https_proxy='<%= $proxy %>'
-<% } -%>
-<% if $no_proxy { -%>
-export no_proxy='<%= $no_proxy.convert_to(Array).join(',') %>'
-<% } -%>
-
-# # This is also a handy place to tweak where Docker's temporary files go.
-export TMPDIR="<%= $tmp_dir %>"
-
-# # Use DOCKER_OPTS to modify the daemon startup options.
-DOCKER_OPTS="\
-<% if $root_dir { %><%= $root_dir_flag %> <%= $root_dir %><% } -%>
-<% if $tcp_bind { %><% $tcp_bind_array.each |$param| { %> -H <%= $param %><% } %><% } -%>
-<% if $tls_enable { %> --tls<% if $tls_verify { %> --tlsverify<% } %> --tlscacert=<%= $tls_cacert %> --tlscert=<%= $tls_cert %> --tlskey=<%= $tls_key %><% } -%>
-<% if $socket_bind { %> -H <%= $socket_bind %><% } -%>
- --ip-forward=<%= $ip_forward -%>
- --iptables=<%= $iptables -%>
- --ip-masq=<%= $ip_masq -%>
-<% if $icc { %> --icc=<%= $icc %><% } -%>
-<% if $fixed_cidr { %> --fixed-cidr <%= $fixed_cidr %><% } -%>
-<% if $bridge { %> --bridge <%= $bridge %><% } -%>
-<% if $default_gateway { %> --default-gateway <%= $default_gateway %><% } -%>
-<% if $log_level { %> -l <%= $log_level %><% } -%>
-<% if $log_driver { %> --log-driver <%= $log_driver %><% } -%>
-<% if $log_driver { %><% if $log_opt { %><% $log_opt.each |$param| { %> --log-opt <%= $param %><% } %><% } -%><% } -%>
-<% if $selinux_enabled { %> --selinux-enabled=<%= $selinux_enabled %><% } -%>
-<% if $socket_group { %> -G <%= $socket_group %><% } -%>
-<% if $dns { %><% $dns_array.each |$address| { %> --dns <%= $address %><% } %><% } -%>
-<% if $dns_search { %><% $dns_search_array.each |$domain| { %> --dns-search <%= $domain %><% } %><% } -%>
-<% if $execdriver { %> -e <%= $execdriver %><% } -%>
-<% if $bip { %> --bip=<%= $bip %><% } -%>
-<% if $mtu { %> --mtu=<%= $mtu %><% } -%>
-<% if type($registry_mirror, 'generalized') == String { %> --registry-mirror=<%= $registry_mirror %><% } -%>
-<% if String(type($registry_mirror, 'generalized')).index('Array') == 0 { %><% $registry_mirror.each |$param| { %> --registry-mirror=<%= $param %><% } %><% } -%>
-<% if $storage_driver { %> --storage-driver=<%= $storage_driver %><% } -%>
-<% if $storage_driver == 'devicemapper' { -%>
-  <%- if $dm_basesize { %> --storage-opt dm.basesize=<%= $dm_basesize %><% } -%>
-  <%- if $dm_fs { %> --storage-opt dm.fs=<%= $dm_fs %><% } -%>
-  <%- if $dm_mkfsarg { %> --storage-opt "dm.mkfsarg=<%= $dm_mkfsarg %>"<% } -%>
-  <%- if $dm_mountopt { %> --storage-opt dm.mountopt=<%= $dm_mountopt %><% } -%>
-  <%- if $dm_blocksize { %> --storage-opt dm.blocksize=<%= $dm_blocksize %><% } -%>
-  <%- if $dm_loopdatasize { %> --storage-opt dm.loopdatasize=<%= $dm_loopdatasize %><% } -%>
-  <%- if $dm_loopmetadatasize { %> --storage-opt dm.loopmetadatasize=<%= $dm_loopmetadatasize %><% } -%>
-  <%- if $dm_thinpooldev { %> --storage-opt dm.thinpooldev=<%= $dm_thinpooldev -%>
-  <%- }else { -%>
-    <%- if $dm_datadev { %> --storage-opt dm.datadev=<%= $dm_datadev %><% } -%>
-    <%- if $dm_metadatadev { %> --storage-opt dm.metadatadev=<%= $dm_metadatadev %><% } -%>
-  <%- } -%>
-<%- if $dm_use_deferred_removal { %> --storage-opt dm.use_deferred_removal=<%= $dm_use_deferred_removal %><% } -%>
-<%- if $dm_use_deferred_deletion { %> --storage-opt dm.use_deferred_deletion=<%= $dm_use_deferred_deletion %><% } -%>
-<%- if $dm_blkdiscard { %> --storage-opt dm.blkdiscard=<%= $dm_blkdiscard %><% } -%>
-<%- if $dm_override_udev_sync_check { %> --storage-opt dm.override_udev_sync_check=<%= $dm_override_udev_sync_check %><% } -%>
-<% } elsif $storage_driver == 'overlay2' { -%>
-  <%- if $overlay2_override_kernel_check { %> --storage-opt overlay2.override_kernel_check=<%= $overlay2_override_kernel_check %><% } -%>
-<% } -%>
-<% $labels.each |$label| { %> --label <%= $label %><% } -%>
-<% if $extra_parameters { %><% $extra_parameters_array.each |$param| { %> <%= $param %><% } %><% } -%>
-"
-<% if $shell_values { %><% $shell_values_array.each |$param| { %>
-<%= $param %><% } %><% } -%>