diff --git a/files/stunnel.service b/files/stunnel.service
deleted file mode 100644
index dce2366b4..000000000
--- a/files/stunnel.service
+++ /dev/null
@@ -1,19 +0,0 @@
-[Unit]
-Description=SSL tunnel for network daemons
-After=network.target
-After=syslog.target
-
-[Install]
-WantedBy=multi-user.target
-Alias=stunnel.target
-
-[Service]
-Type=forking
-ExecStart=/usr/bin/stunnel /etc/stunnel/stunnel.conf
-ExecStop=/usr/bin/killall -9 stunnel
-
-# Give up if ping don't get an answer
-TimeoutSec=600
-
-Restart=always
-PrivateTmp=false
diff --git a/manifests/stunnel.pp b/manifests/stunnel.pp
index 7628b52c0..2d75aafab 100644
--- a/manifests/stunnel.pp
+++ b/manifests/stunnel.pp
@@ -17,14 +17,6 @@
 #
 # Installs and starts stunnel
 #
-# [*manage_service*]
-#   (Optional) Whether we'll be managing the stunnel service or not.
-#   Defaults to true
-#
-# [*service_ensure*]
-#   (Optional) Ensure the service be running or stopped
-#   Defaults to 'running'
-#
 # [*foreground*]
 #   (Optional) Sets the configuration for stunnel to run the process in
 #   the foreground. This is useful when trying to run stunnel in a
@@ -36,10 +28,8 @@
 #   Defaults to '4' which translates to 'warning'.
 #
 class tripleo::stunnel (
-  $manage_service = true,
-  $service_ensure = 'running',
-  $foreground     = 'no',
-  $debug          = 'warning',
+  $foreground = 'no',
+  $debug      = 'warning',
 ){
   package { 'stunnel':
     ensure => 'present'
@@ -53,13 +43,4 @@ class tripleo::stunnel (
     order   => '10-foreground-config',
     content => template('tripleo/stunnel/foreground.erb'),
   }
-  if $manage_service {
-    Concat['/etc/stunnel/stunnel.conf'] ~> Service['stunnel']
-
-    include tripleo::stunnel::systemd_unit
-
-    service { 'stunnel':
-      ensure => $service_ensure
-    }
-  }
 }
diff --git a/manifests/stunnel/service_proxy.pp b/manifests/stunnel/service_proxy.pp
index 591210056..80dc12357 100644
--- a/manifests/stunnel/service_proxy.pp
+++ b/manifests/stunnel/service_proxy.pp
@@ -61,6 +61,4 @@ define tripleo::stunnel::service_proxy (
     order   => "20-${name}",
     content => template('tripleo/stunnel/service.erb'),
   }
-
-  Concat::Fragment["stunnel-service-${name}"] ~> Service<| title == 'stunnel' |>
 }
diff --git a/manifests/stunnel/systemd_unit.pp b/manifests/stunnel/systemd_unit.pp
deleted file mode 100644
index c82e8258c..000000000
--- a/manifests/stunnel/systemd_unit.pp
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2017 Red Hat, Inc.
-# All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-
-# == Class: tripleo::stunnel::systemd_unit
-#
-# Configures the systemd unit for stunnel
-#
-class tripleo::stunnel::systemd_unit {
-  systemd::unit_file {'stunnel.service':
-    source => 'puppet:///modules/tripleo/stunnel.service'
-  }
-}