diff --git a/debian_pkg_dirs b/debian_pkg_dirs
new file mode 100644
index 00000000..010daae3
--- /dev/null
+++ b/debian_pkg_dirs
@@ -0,0 +1 @@
+fm-mgr
diff --git a/fm-mgr/debian/control b/fm-mgr/debian/control
deleted file mode 100644
index 76889975..00000000
--- a/fm-mgr/debian/control
+++ /dev/null
@@ -1,14 +0,0 @@
-Source: fm-mgr
-Priority: optional
-Maintainer: StarlingX team <starlingx-discuss@lists.starlingx.io>
-Build-Depends: debhelper (>=9),
-               uuid-dev,
-               libsystemd-dev,
-               fm-common-dev
-Standards-Version: 3.9.6
-
-Package: fm-mgr
-Architecture: any
-Pre-Depends: ${misc:Depends},
-             ${shlibs:Depends}
-Description: This package contains StarlingX fm-mgr project.
diff --git a/fm-mgr/debian/deb_folder/changelog b/fm-mgr/debian/deb_folder/changelog
new file mode 100644
index 00000000..dd1d130b
--- /dev/null
+++ b/fm-mgr/debian/deb_folder/changelog
@@ -0,0 +1,5 @@
+fm-mgr (1.0-1) unstable; urgency=medium
+
+  * Initial release.
+
+ -- Tracey Bogue <tracey.bogue@windriver.com>  Fri, 17 Sep 2021 14:52:21 +0000
diff --git a/fm-mgr/debian/deb_folder/control b/fm-mgr/debian/deb_folder/control
new file mode 100644
index 00000000..1d0f0913
--- /dev/null
+++ b/fm-mgr/debian/deb_folder/control
@@ -0,0 +1,16 @@
+Source: fm-mgr
+Priority: optional
+Section: libs
+Maintainer: StarlingX team <starlingx-discuss@lists.starlingx.io>
+Build-Depends: debhelper-compat (= 13)
+Build-Depends-Indep: uuid-dev, libsystemd-dev, fm-common-dev
+Standards-Version: 4.5.1
+Rules-Requires-Root: no
+
+Package: fm-mgr
+Section: libs
+Architecture: any
+Multi-Arch: same
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: StarlingX Fault Manager
+ This package contains StarlingX fm-mgr project.
diff --git a/fm-mgr/debian/deb_folder/copyright b/fm-mgr/debian/deb_folder/copyright
new file mode 100644
index 00000000..0e55bce8
--- /dev/null
+++ b/fm-mgr/debian/deb_folder/copyright
@@ -0,0 +1,42 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: fm-mgr
+Source: https://opendev.org/starlingx/fault
+
+Files: *
+Copyright: (c) 2013-2021 Wind River Systems, Inc
+Copyright: Others ((See individual files for more details)
+License: Apache-2
+ 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
+ .
+    https://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.
+ .
+ On Debian-based systems the full text of the Apache version 2.0 license
+ can be found in `/usr/share/common-licenses/Apache-2.0'.
+
+# If you want to use GPL v2 or later for the /debian/* files use
+# the following clauses, or change it to suit. Delete these two lines
+Files: debian/*
+Copyright: 2021 Wind River Systems, Inc
+License: Apache-2
+ 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
+ .
+    https://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.
+ .
+ On Debian-based systems the full text of the Apache version 2.0 license
+ can be found in `/usr/share/common-licenses/Apache-2.0'.
diff --git a/fm-mgr/debian/deb_folder/fm-mgr.install b/fm-mgr/debian/deb_folder/fm-mgr.install
new file mode 100644
index 00000000..fbaea7fd
--- /dev/null
+++ b/fm-mgr/debian/deb_folder/fm-mgr.install
@@ -0,0 +1,4 @@
+usr/bin/fmManager
+etc/init.d/fminit
+etc/logrotate.d/fm.logrotate
+usr/lib/systemd/system/fminit.service
diff --git a/fm-mgr/debian/deb_folder/rules b/fm-mgr/debian/deb_folder/rules
new file mode 100755
index 00000000..6bee34a0
--- /dev/null
+++ b/fm-mgr/debian/deb_folder/rules
@@ -0,0 +1,14 @@
+#!/usr/bin/make -f
+#export DH_VERBOSE = 1
+
+export ROOT=debian/tmp
+
+%:
+	dh $@
+
+override_dh_auto_install:
+	make DESTDIR=${ROOT} \
+		BINDIR=/usr/bin \
+		LIBDIR=/usr/lib \
+		SYSCONFDIR=/etc \
+		install
diff --git a/fm-mgr/debian/deb_folder/source/format b/fm-mgr/debian/deb_folder/source/format
new file mode 100644
index 00000000..163aaf8d
--- /dev/null
+++ b/fm-mgr/debian/deb_folder/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/fm-mgr/debian/meta_data.yaml b/fm-mgr/debian/meta_data.yaml
new file mode 100644
index 00000000..bc80059a
--- /dev/null
+++ b/fm-mgr/debian/meta_data.yaml
@@ -0,0 +1,7 @@
+---
+debname: fm-mgr
+debver: 1.0
+src_path: sources
+revision:
+  dist: $STX_DIST
+  PKG_GITREVCOUNT: true
diff --git a/fm-mgr/debian/rules b/fm-mgr/debian/rules
deleted file mode 100644
index 5cb837a1..00000000
--- a/fm-mgr/debian/rules
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/make -f
-
-%:
-	dh $@
-
-override_dh_usrlocal: