diff --git a/.circleci/packages/config.yaml b/.circleci/packages/config.yaml
index 5d981f0d37d..9c3cbf43a22 100644
--- a/.circleci/packages/config.yaml
+++ b/.circleci/packages/config.yaml
@@ -77,6 +77,11 @@ packages:
         group:  root
         perms:  0755
         target: usr/lib/influxdb/scripts/influxd-systemd-start.sh
+
+      - owner:  root
+        group:  root
+        perms:  0644
+        target: lib/systemd/system/influxdb.service
     rpm_attributes:
       - 750,influxdb,influxdb:/var/log/influxdb
       - 750,influxdb,influxdb:/var/lib/influxdb
diff --git a/.circleci/packages/influxdb/control/post-install b/.circleci/packages/influxdb/control/post-install
index 9a090dd9362..0643cbba92d 100644
--- a/.circleci/packages/influxdb/control/post-install
+++ b/.circleci/packages/influxdb/control/post-install
@@ -12,7 +12,8 @@ function install_init {
 }
 
 function install_systemd {
-    cp -f $SCRIPT_DIR/influxdb.service /lib/systemd/system/influxdb.service
+    # Service file is now installed directly by RPM - just enable it
+    systemctl daemon-reload
     systemctl enable influxdb
 }
 
diff --git a/.circleci/packages/influxdb/control/post-uninstall b/.circleci/packages/influxdb/control/post-uninstall
index fdfd6644ee2..0f9e11a7ce1 100644
--- a/.circleci/packages/influxdb/control/post-uninstall
+++ b/.circleci/packages/influxdb/control/post-uninstall
@@ -2,7 +2,6 @@
 
 function disable_systemd {
     systemctl disable influxdb
-    rm -f /lib/systemd/system/influxdb.service
 }
 
 function disable_update_rcd {
diff --git a/.circleci/packages/influxdb/fs/usr/lib/influxdb/scripts/influxdb.service b/.circleci/packages/influxdb/fs/lib/systemd/system/influxdb.service
similarity index 100%
rename from .circleci/packages/influxdb/fs/usr/lib/influxdb/scripts/influxdb.service
rename to .circleci/packages/influxdb/fs/lib/systemd/system/influxdb.service