diff --git a/templates/common/.spin-inventory.ini b/templates/common/.spin-inventory.ini
deleted file mode 100644
index 81a717df..00000000
--- a/templates/common/.spin-inventory.ini
+++ /dev/null
@@ -1,39 +0,0 @@
-####################
-# Host Types
-####################
-
-[production_managers]
-# server01.example.com
-
-[production_workers]
-
-[staging_managers]
-# server02.example.com
-
-[production_workers]
-
-####################
-# Swarm Roles
-####################
-[swarm_managers:children]
-production_managers
-staging_managers
-
-[swarm_workers:children]
-production_workers
-staging_workers
-
-####################
-# Environment
-####################
-[production:children]
-production_managers
-production_workers
-
-[staging:children]
-staging_managers
-staging_workers
-
-[all_servers:children]
-production
-staging
\ No newline at end of file
diff --git a/templates/common/.spin.yml b/templates/common/.spin.yml
deleted file mode 100644
index febc1ad1..00000000
--- a/templates/common/.spin.yml
+++ /dev/null
@@ -1,115 +0,0 @@
----
-###########################################
-# Basic Server Configuration
-###########################################
-server_timezone: "Etc/UTC"
-server_contact: changeme@example.com
-
-# SSH
-server_ssh_port: "22"
-
-## Email Notifications
-postfix_hostname: "{{ inventory_hostname }}"
-
-## Set variables below to enable external SMTP relay
-# postfix_relayhost: "smtp.example.com"
-# postfix_relayhost_port: "587"
-# postfix_relayhost_username: "myusername"
-# postfix_relayhost_password: "mysupersecretpassword"
-
-##############################################################
-# Users
-##############################################################
-
-### Use the template below to set users and their authorized keys
-## Passwords must be set with an encrypted hash. To do this, see the Ansible FAQ.
-## Your best bet is probably using the `mkpasswd` on a Linux machine.
-## https://docs.ansible.com/ansible/latest/reference_appendices/faq.html#how-do-i-generate-encrypted-passwords-for-the-user-module
-
-# users:
-#   - username: alice
-#     name: Alice Smith
-#     state: present
-#     groups: ['adm','sudo']
-#     password: "$6$mysecretsalt$qJbapG68nyRab3gxvKWPUcs2g3t0oMHSHMnSKecYNpSi3CuZm.GbBqXO8BE6EI6P1JUefhA0qvD7b5LSh./PU1"
-#     shell: "/bin/bash"
-#     authorized_keys:
-#       - public_key: "ssh-ed25519 AAAAC3NzaC1lmyfakeublickeyMVIzwQXBzxxD9b8Erd1FKVvu alice"
-
-#   - username: bob
-#     name: Bob Smith
-#     state: present
-#     password: "$6$mysecretsalt$qJbapG68nyRab3gxvKWPUcs2g3t0oMHSHMnSKecYNpSi3CuZm.GbBqXO8BE6EI6P1JUefhA0qvD7b5LSh./PU1"
-#     groups: ['adm','sudo']
-#     shell: "/bin/bash"
-#     authorized_keys:
-#       - public_key: "ssh-ed25519 AAAAC3NzaC1anotherfakekeyIMVIzwQXBzxxD9b8Erd1FKVvu bob"
-
-### Additional users
-## You can also set additional users (great if you're working with contractors or clients on certain groups of servers)
-## These users will be flattened into the users list (if you set any settings below)
-
-# additional_users:
-#   - username: charlie
-#     name: Charlie Smith
-#     state: present
-#     groups: ['adm','sudo']
-#     password: "$6$mysecretsalt$qJbapG68nyRab3gxvKWPUcs2g3t0oMHSHMnSKecYNpSi3CuZm.GbBqXO8BE6EI6P1JUefhA0qvD7b5LSh./PU1"
-#     shell: "/bin/bash"
-#     authorized_keys:
-#       - public_key: "ssh-ed25519 AAAAC3NzaC1lmyfakeublickeyMVIzwQXBzxxD9b8Erd1FKVvu alice"
-
-#   - username: dana
-#     name: Dana Smith
-#     state: present
-#     password: "$6$mysecretsalt$qJbapG68nyRab3gxvKWPUcs2g3t0oMHSHMnSKecYNpSi3CuZm.GbBqXO8BE6EI6P1JUefhA0qvD7b5LSh./PU1"
-#     groups: ['adm','sudo']
-#     shell: "/bin/bash"
-#     authorized_keys:
-#       - public_key: "ssh-ed25519 AAAAC3NzaC1anotherfakekeyIMVIzwQXBzxxD9b8Erd1FKVvu bob"
-
-###########################################
-# Advanced Server Configurations
-###########################################
-
-# Time is in seconds (default: 24 hours)
-apt_cache_expiration: 86400
-
-# Common packages to install
-common_installed_packages:
-  - cron
-  - curl
-  - figlet
-  - fail2ban
-  - git
-  - htop
-  - logrotate
-  - mailutils
-  - ncdu
-  - ntp
-  - python3-minimal
-  - ssh
-  - tzdata
-  - ufw
-  - unattended-upgrades
-  - unzip
-  - wget
-  - zip
-
-# APT - Automatic Update Configuration
-apt_periodic_update_package_lists: "1"
-apt_periodic_download_upgradeable_packages: "1"
-apt_periodic_autoclean_interval: "7"
-apt_periodic_unattended_upgrade: "1"
-
-###########################################
-# Fun Terminal Customizations
-###########################################
-motd_header_text: "ServerSideUp"
-motd_header_text_color: '\e[38;5;255m'
-motd_header_background_color: '\e[48;5;34m'
-motd_hostname_text_color: '\e[38;5;202m'
-motd_services:
-  - ufw
-  - fail2ban
-  - postfix
\ No newline at end of file