diff --git a/packaging/el7/main.spec b/packaging/el7/main.spec.afjq
similarity index 93%
rename from packaging/el7/main.spec
rename to packaging/el7/main.spec.afjq
index 7004795..8045b61 100644
--- a/packaging/el7/main.spec
+++ b/packaging/el7/main.spec.afjq
@@ -1,20 +1,22 @@
 %global debug_package %{nil}
 
-Name: ::package_name::
-Version: ::package_version::
-Release: ::package_build_version::%{?dist}
-Summary: ::package_description_short::
-License: ::package_licence::
-URL: ::package_url::
+Name: @@ .name @@
+Version: @@ .version @@
+Release: @@ .buildVersion @@%{?dist}
+Summary: @@ .description.short @@
+License: @@ .licence @@
+URL: @@ .url @@
 Source0: %{name}-%{version}.tar.gz
-BuildArch: ::package_architecture_el::
-Requires: ::package_dependencies_el::
+BuildArch: @@ .architecture.el @@
+Requires: @@ .dependencies.el @@
+Vendor: 45Drives
+Packager: @@ .changelog.packager @@
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 %description
-::package_title::
-::package_description_long::
+@@ .title @@
+@@ .description.long @@
 
 %prep
 %setup -q
@@ -109,4 +111,4 @@ rm -rf %{buildroot}
   entries.
 - Add custom right click menu.
 * Fri May 28 2021 Josh Boudreau <jboudreau@45drives.com> 0.1.0-1
-- First Build
\ No newline at end of file
+- First Build
diff --git a/packaging/el8/main.spec b/packaging/el8/main.spec.afjq
similarity index 91%
rename from packaging/el8/main.spec
rename to packaging/el8/main.spec.afjq
index 7004795..fef064b 100644
--- a/packaging/el8/main.spec
+++ b/packaging/el8/main.spec.afjq
@@ -1,20 +1,22 @@
 %global debug_package %{nil}
 
-Name: ::package_name::
-Version: ::package_version::
-Release: ::package_build_version::%{?dist}
-Summary: ::package_description_short::
-License: ::package_licence::
-URL: ::package_url::
+Name: @@ .name @@
+Version: @@ .version @@
+Release: @@ .buildVersion @@%{?dist}
+Summary: @@ .description.short @@
+License: @@ .licence @@
+URL: @@ .url @@
 Source0: %{name}-%{version}.tar.gz
-BuildArch: ::package_architecture_el::
-Requires: ::package_dependencies_el::
+BuildArch: @@ .architecture.el @@
+Requires: @@ .dependencies.el @@
+Vendor: 45Drives
+Packager: @@ .changelog.packager @@
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 %description
-::package_title::
-::package_description_long::
+@@ .title @@
+@@ .description.long @@
 
 %prep
 %setup -q
@@ -32,6 +34,8 @@ rm -rf %{buildroot}
 /usr/share/cockpit/navigator/*
 
 %changelog
+* Mon Jun 06 2022 Joshua Boudreau <jboudreau@45drives.com> 0.5.8-2
+- Add file and coreutils dependencies.
 * Wed Dec 01 2021 Joshua Boudreau <jboudreau@45drives.com> 0.5.8-1
 - Fix non-root user file downloads.
 * Mon Nov 29 2021 Joshua Boudreau <jboudreau@45drives.com> 0.5.7-1
@@ -109,4 +113,4 @@ rm -rf %{buildroot}
   entries.
 - Add custom right click menu.
 * Fri May 28 2021 Josh Boudreau <jboudreau@45drives.com> 0.1.0-1
-- First Build
\ No newline at end of file
+- First Build
diff --git a/packaging/focal/control b/packaging/focal/control
deleted file mode 100644
index d9bdb6a..0000000
--- a/packaging/focal/control
+++ /dev/null
@@ -1,12 +0,0 @@
-Source: ::package_name::
-Section: ::package_category::
-Priority: ::package_priority::
-Maintainer: ::package_author::
-Build-Depends: debhelper-compat (= 12)
-Standards-Version: 4.4.1
-Homepage: ::package_url::
-
-Package: ::package_name::
-Architecture: ::package_architecture_deb::
-Depends: ::package_dependencies_deb::
-Description: ::package_description_short::
diff --git a/packaging/focal/control.afjq b/packaging/focal/control.afjq
new file mode 100644
index 0000000..98f4f06
--- /dev/null
+++ b/packaging/focal/control.afjq
@@ -0,0 +1,14 @@
+Source: @@.name@@
+Section: @@.category@@
+Priority: @@.priority@@
+Maintainer: @@.author@@
+Build-Depends: debhelper-compat (= 12)
+  @@.buildDependencies.deb@@
+Standards-Version: 4.4.1
+Homepage: @@.url@@
+
+Package: @@.name@@
+Architecture: @@.architecture.deb@@
+Depends: @@.dependencies.deb@@
+Description: @@.description.short@@
+  @@.description.long@@