diff --git a/builder.spec b/builder.spec
index 23ee387..f1b2819 100644
--- a/builder.spec
+++ b/builder.spec
@@ -1,5 +1,5 @@
-Name:           template-builder
-Version:  	1.0
+Name:           3isec-qubes-builder
+Version:  	1.1
 Release:        1%{?dist}
 Summary:        Salt builder template
 
@@ -7,17 +7,25 @@ License:        GPLv3+
 SOURCE0:	builder
 
 %description
-Salt state for Qubes builder template
+Salt state for builder qube and template
 
 %install
 rm -rf %{buildroot}
-mkdir -p %{buildroot}/srv/salt
-cp -rv %{SOURCE0}/  %{buildroot}/srv/salt
+mkdir -p %{buildroot}/srv/salt/build
+cp -rv %{SOURCE0}/*  %{buildroot}/srv/salt/build
 
 %files
 %defattr(-,root,root,-)
-/srv/salt/builder/*
+/srv/salt/build/*
+
+%pos
+qubesctl state.apply build.create
+qubesctl --skip-dom0 --targets=template-builder state.apply build.install
+qubesctl --skip-dom0 --targets=builder state.apply build.config
+
 
 %changelog
-* Wed Fed 03 2021 unman <unman@thirdeyesecurity.org>
+* Sat May 21 2021 unman <unman@thirdeyesecurity.org>
+- Change name
+* Wed Feb 03 2021 unman <unman@thirdeyesecurity.org>
 - First Build
diff --git a/print.spec b/print.spec
index 05194fd..f7434ff 100644
--- a/print.spec
+++ b/print.spec
@@ -1,5 +1,5 @@
 Name:           3isec-qubes-sys-printer
-Version:       	1.1
+Version:       	1.2
 Release:        1%{?dist}
 Summary:        Salt a printer qube in Qubes
 
@@ -21,6 +21,7 @@ cp -rv %{SOURCE0}/  %{buildroot}/srv/salt
 %post
 if [ $1 -eq 1 ]; then
   qubesctl state.apply print.create
+  qubesctl --skip-dom0 --targets=template-printer state.apply print.install
   qubesctl --skip-dom0 --targets=sys-printer state.apply print.configure
 fi
 
@@ -30,6 +31,8 @@ if [ $1 -eq 0 ]; then
 fi
 
 %changelog
+* Sun May 22 2022 unman <unman@thirdeyesecurity.org> - 1.2
+- Add template and package installation to  post
 * Sat May 21 2022 unman <unman@thirdeyesecurity.org> - 1.1
 - Standardise package names to 3isec-
 * Sun May 15 2022 unman <unman@thirdeyesecurity.org> - 1.0
diff --git a/qubes-ssh-agent.spec b/qubes-ssh-agent.spec
new file mode 100644
index 0000000..87b311c
--- /dev/null
+++ b/qubes-ssh-agent.spec
@@ -0,0 +1,34 @@
+Name:           3isec-qubes-sys-ssh-agent
+Version:       	1.0
+Release:        1%{?dist}
+Summary:        Salt a qube to hold ssh-agents
+
+License:        GPLv3+
+SOURCE0:	qubes-ssh-agent
+
+%description
+Salt state to implement a qube to hold ssh-agents
+
+%install
+rm -rf %{buildroot}
+mkdir -p %{buildroot}/srv/salt
+cp -rv %{SOURCE0}/  %{buildroot}/srv/salt
+
+%files
+%defattr(-,root,root,-)
+/srv/salt/qubes-ssh-agent/*
+
+%post
+if [ $1 -eq 1 ]; then
+  qubesctl state.apply qubes-ssh-agent.create
+  qubesctl --skip-dom0 --targets=sys-ssh-agent state.apply qubes-ssh-agent.configure
+fi
+
+%postun
+if [ $1 -eq 0 ]; then
+  sed -i /qubes.SshAgent/d /etc/qubes/policy.d/30-user.policy
+fi
+
+%changelog
+* Sun May 22 2022 unman <unman@thirdeyesecurity.org> - 1.0
+- First Build