diff --git a/.gitignore b/.gitignore
index 3e39dc4f..028d7cf7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,9 @@
 qemu/
 virtualbox-iso/
 vmware-iso/
-
+packer_plugins/
+ansible/collections
+ansible/roles
 # Created by https://www.gitignore.io/api/packer
 
 ### Packer ###
@@ -12,8 +14,10 @@ packer_cache/
 *.box
 
 # End of https://www.gitignore.io/api/packer
-centos-7.3-x86_64
+
 .vault_pass
+.vault_password
 *.retry
 .venv
-centos-7.x-x86_64/
+.vscode
+.idea
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 00000000..d464c51f
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,5 @@
+# Contributor information
+
+Images are built from each tag and published as
+[GitHub releases](https://github.com/usegalaxy-eu/vgcn/releases). All releases (including old ones) are also available
+[on this website](https://usegalaxy.eu/static/vgcn/).
\ No newline at end of file
diff --git a/Makefile b/Makefile
deleted file mode 100644
index e7a2a7c8..00000000
--- a/Makefile
+++ /dev/null
@@ -1,138 +0,0 @@
-# Simple Makefile to build base VM images using packer and ansible
-# TODO
-# 	* support ssh per user instead of root
-# 	* support building with non-qemu builders and convert to qemu afterwards
-# 	* testing target
-# 	* auto-detect flavors
-PACKER := $(shell which packer)
-ifndef PACKER
-$(error packer not found, please install it)
-endif
-
-ANSIBLE_DIR=ansible-roles
-# the "provisioning" flavor, expects a 'setup-<flavor>.yml' playbook
-# in the 'ansible-roles' submodule! This will likely change...
-FLAVORS = vgcn-bwcloud vgcn-bwcloud-gpu vgcn-bwcloud-secure jenkins generic
-SUPPORTED_BUILDERS = qemu
-# check which hypervisors are available
-ifeq ($(shell which qemu-system-$(shell uname -m | sed 's/i686/i386/') 2>&1 > /dev/null && echo $$?), 0)
-AVAILABLE_BUILDERS += qemu
-BUILDER := qemu
-endif
-
-TEMPLATES := $(basename $(filter-out base.json,$(wildcard *.json)))
-
-BASETARGETS := $(foreach template, $(TEMPLATES), $(template)/base)
-PROVTARGETS := $(foreach template, $(TEMPLATES), $(foreach flavor, $(FLAVORS), $(template)/$(flavor)))
-INTERNALTARGETS := $(foreach template, $(TEMPLATES), $(foreach flavor, $(FLAVORS), $(template)/$(flavor)-internal))
-EXTERNALTARGETS := $(foreach template, $(TEMPLATES), $(foreach flavor, $(FLAVORS), $(template)/$(flavor)-external))
-
-PACKER_OPTS := -var-file=base.json
-ifdef DEBUG
-  PACKER_OPTS += -debug
-  PACKER_OPTS += -var='headless=false'
-endif
-
-.PHONY: all help clean
-all: help
-
-## 
-# 	Creating base images
-##
-$(BASETARGETS):
-	$(info ** Building template '$(@D)' using '$(BUILDER)' **)
-	$(PACKER) build -only=$(BUILDER) \
-		$(PACKER_OPTS) \
-		-var='vm_name=$(@D)' \
-		$(@D).json
-	@test -f output-$(@D)-$(BUILDER)/$(@D) || false
-	@-test -d $(@D)/base && rm -rf $(@D)/base
-	@-mkdir $(@D)
-	@mv output-$(@D)-$(BUILDER) $(@D)/base
-	@mv $(@D)/base/$(@D) $(@D)/base/image
-	@echo "** Success **"
-
-##
-#		Provisioning images
-##
-$(PROVTARGETS): deps
-$(foreach flav, $(FLAVORS), %/$(flav)): %/base
-	$(info ** Provisioning '$(@D)' with '$(@F)' **)
-	$(PACKER) build -only=$(BUILDER) \
-		$(PACKER_OPTS) \
-		-var='vm_name=$(@F)' \
-		-var='image_dir=$(@D)' \
-		-var='image_name=base/image' \
-		-var='playbook=setup-$(@F).yml' \
-		$(ANSIBLE_DIR)/run-playbook-only.json
-	@test -f output-$(@D)/$(@F) || false
-	@-test -d $(@D)/$(@F) && rm -rf $(@D)/$(@F)
-	@-mkdir $(@D)/$(@F)
-	@mv output-$(@D)/$(@F) $(@D)/$(@F)/image
-	@rmdir output-$(@D)
-	@echo "** Success **"
-
-
-# Internal image version
-$(INTERNALTARGETS):
-$(foreach flav, $(FLAVORS), %/$(flav)-internal):  # bug: doesn't do deps right.
-	$(info ** Provisioning '$(@D)' with '$(@F)' **)
-	$(PACKER) build -only=$(BUILDER) \
-		$(PACKER_OPTS) \
-		-var='vm_name=$(@F)' \
-		-var='image_dir=$(@D)' \
-		-var='image_name=$(subst -internal,,$(@F))/image' \
-		-var='playbook=internal.yml' \
-		$(ANSIBLE_DIR)/run-playbook-only-internal.json
-	@test -f output-$(@D)/$(@F) || false
-	@-test -d $(@D)/$(@F) && rm -rf $(@D)/$(@F)
-	@-mkdir $(@D)/$(@F)
-	@mv output-$(@D)/$(@F) $(@D)/$(@F)/image
-	@rmdir output-$(@D)
-	@echo "** Success **"
-
-# external image version
-$(EXTERNALTARGETS):
-$(foreach flav, $(FLAVORS), %/$(flav)-external):  # bug: doesn't do deps right.
-	$(info ** Provisioning '$(@D)' with '$(@F)' **)
-	$(PACKER) build -only=$(BUILDER) \
-		$(PACKER_OPTS) \
-		-var='vm_name=$(@F)' \
-		-var='image_dir=$(@D)' \
-		-var='image_name=$(subst -external,,$(@F))/image' \
-		-var='playbook=external.yml' \
-		$(ANSIBLE_DIR)/run-playbook-only.json
-	@test -f output-$(@D)/$(@F) || false
-	@-test -d $(@D)/$(@F) && rm -rf $(@D)/$(@F)
-	@-mkdir $(@D)/$(@F)
-	@mv output-$(@D)/$(@F) $(@D)/$(@F)/image
-	@rmdir output-$(@D)
-	@echo "** Success **"
-
-help:
-	@echo "General syntax: <template>/<flavor>[/boot]"
-	@echo
-	@echo "Detected builders:"
-	@(for B in $(AVAILABLE_BUILDERS); do echo "\t$$B"; done)
-	@echo
-	@echo "Base images:"
-	@(for T in $(BASETARGETS); do echo "\t$$T"; done)
-	@echo
-	@echo "Provisioning: "
-	@(for P in $(PROVTARGETS); do echo "\t$$P"; done)
-	@echo
-
-# The builds are directories named after the template name
-clean:
-	-$(foreach build_dir,$(TEMPLATES),test -d $(build_dir) && rm -rf $(build_dir);)
-
-
-cloud_cleanup:
-	openstack image list -c ID -c Name -f value | grep vggp | awk '{print $1}' | xargs openstack image delete
-
-deps:
-	mkdir -p $(ANSIBLE_DIR)
-	ansible-galaxy install -p $(ANSIBLE_DIR) -r requirements.yml
-	mkdir -p $(ANSIBLE_DIR)/collections
-	ansible-galaxy collection install -p $(ANSIBLE_DIR)/collections -r requirements.yml
-
diff --git a/README.md b/README.md
index 7ee44519..248f5a26 100644
--- a/README.md
+++ b/README.md
@@ -1,102 +1,90 @@
-# Virtual Galaxy Compute Nodes (VGCN)
-
-This repo contains all of the components required to build the "Virtual Galaxy
-Compute Nodes" (VGCN) that make up the HTCondor cloud used in UseGalaxy.eu
-
-Pre-built images are available here: [https://usegalaxy.eu/static/vgcn/](https://usegalaxy.eu/static/vgcn/)
-
-## Features
-
-All in one image, a single image gets you:
-
-- HTCondor
-- Pulsar
-- NFS
-- CVMFS
-- Singularity
-- Docker
-
-Everything you need to run Galaxy jobs. You can structure this in various ways that meet your needs:
-
-- Like useGalaxy.eu: one VM as the condor master, another N as job runners
-- Like EU's remote clusters: one VM as the condor master + pulsar, another as NFS, and the rest as job runners
-- For BYOC: A single node that does condor master + pulsar + job execution
-
-## Development
-
-Development happens into the __dev__ branch, images are built from __main__ branch.
-
-## Changelog
-
-- 60:
-    - MODIFIED: moved to Rocky Linux 8
-- 50:
-    - MODIFIED: updated Pulsar to version 0.14.11
-    - MODIFIED: moved to kernel 5.x
-- 40:
-    - ADDED: Nvidia driver
-    - ADDED: Cuda toolkit
-    - ADDED: GPU accelerated Docker containers support
-    - MODIFIED: moved to CENTOS8
-    - MODIFIED: updated Pulsar to version 0.14.0
-    - MODIFIED: updated HTCondor to version 8.8
-- 32:
-    - MODIFIED: Pulsar toward Py3
-- 31:
-    - ADDED: Pulsar
-    - ADDED: Fonts for some jobs
-    - ADDED: `at` daemon
-    - MODIFIED: Additional 'internal' and 'external' targets allowing us to include signed SSH host keys.
-    - REMOVED: vault
-    - REMOVED: roced
-- 21: Initial Release
-
-## Makefile
-
-We include a makefile that should build the images, running `make` will inform you of the available targets:
-
-```console
-$ make
-General syntax: <template>/<flavor>[/boot]
-Detected builders:
-        qemu
-Base images:
-        centos-8.x-x86_64/base
-        rockylinux-8.x-x86_64/base
-        centos-7.x-x86_64/base
-
-Provisioning:
-        centos-8.x-x86_64/vgcn-bwcloud
-        centos-8.x-x86_64/jenkins
-        centos-8.x-x86_64/generic
-        rockylinux-8.x-x86_64/vgcn-bwcloud
-        rockylinux-8.x-x86_64/jenkins
-        rockylinux-8.x-x86_64/generic
-        centos-7.x-x86_64/vgcn-bwcloud
-        centos-7.x-x86_64/jenkins
-        centos-7.x-x86_64/generic
+# Virtual Galaxy Compute Nodes
+
+[Galaxy Europe](https://usegalaxy.eu/) runs jobs on compute nodes belonging
+to the
+[bwCloud](https://www.bw-cloud.org/)/[de.NBI-cloud](https://www.denbi.de/).
+These compute nodes are known as "Virtual Galaxy Compute Nodes" (VGCN).
+
+Virtual Galaxy Compute Nodes boot from VGCN images, which are built off this
+repository and made available as
+[GitHub releases](https://github.com/usegalaxy-eu/vgcn/releases) and on
+[this static site](https://usegalaxy.eu/static/vgcn/).
+
+## Virtual Galaxy Compute Node images
+
+Virtual Galaxy Compute Node images contain everything needed to run
+Galaxy jobs.
+
+- [Apptainer](https://apptainer.org/)
+- [CVMFS](https://cernvm.cern.ch/fs/)
+- [Docker](https://www.docker.com/)
+- [NFS](https://nfs.sourceforge.net/)
+- [Pulsar](https://github.com/galaxyproject/pulsar)
+- [Telegraf](https://www.influxdata.com/time-series-platform/telegraf/)
+
+Each service can be further configured via
+[cloud-init](https://cloudinit.readthedocs.io/en/23.2.2/) scripts to meet 
+specific needs. A few setup ideas:
+
+- Like on usegalaxy.eu: one machine as the HTCondor master, the rest as job 
+  runners.
+- Like usegalaxy.eu's remote clusters: one machine as the HTCondor master and
+  pulsar server, another as NFS file server, the rest as job runners.
+- For "Bring Your own Compute" (BYOC) use cases: A single node that acts as
+  HTCondor master, Pulsar server, and job runner.
+
+**Important:** HTCondor has a new authentication mechanism, which uses
+passwords and tokens, generated automatically during startup. The easiest and
+least error-prone way to set this up is during
+[installation](https://htcondor.readthedocs.io/en/latest/getting-htcondor/admin-quick-start.html#administrative-quick-start-guide).
+
+```diff
+! This is why we removed HTCondor from public images.
 ```
 
-## Dependencies
+You can easily install it and set up your password by adding the `execute`
+installation line from the link above to your cloud-init script. There you can
+set your own password and host. Both should be identical on all machines you
+use, the host is the hostname or IP address of your central manager - usually
+the node that accepts Pulsar requests. An implementation in
+[Pulsar-Infrastructure-Playbook](https://github.com/usegalaxy-eu/pulsar-infrastructure-playbook)
+is in progress.
 
-We have listed the versions we use, but other versions may work.
+## Build instructions
 
-| Component                                      | Version    |
-|------------------------------------------------|------------|
-| [Packer](https://www.packer.io/downloads.html) | 1.0.4      |
-| Ansible                                        | >= 2.4.3.0 |
-| qemu                                           | 2.5.0      |
+Make sure the following packages are installed on your system.
 
-## Building This Yourself
+- [Packer](https://www.packer.io/downloads.html) >= 1.9.1, < 2
+- [QEMU](https://www.packer.io/downloads.html) >= 6.2, < 9
+- [Ansible](https://www.ansible.com/), see [requirements.txt](./requirements.txt)
 
-All of the images are designed to be as generic as possible so you can use them
-as-is. We will provide built images, but if you wish to build them yourself,
-you'll simply want to do:
+Run the `build.py` script to automatically template, provision, and assemble the image. 
 
+```shell
+python build.py <template> <provisioning>... <delivery> [options]
 ```
-make rockylinux-8.x-x86_64/vgcn-bwcloud
+
+**Example:**
+```shell
+python build.py rockylinux-10-latest-x86_64 workers internal cloud -q
 ```
 
-## Running It
+### Arguments
+
+- **`template`**: Selects the underlying operating system on which the image will be based. Supported templates can be found as `source.qemu.*` blocks in `templates/build.pkr.hcl` (e.g., `rockylinux-10-latest-x86_64`, `rockylinux-9-latest-x86_64`).
+- **`provisioning`**: One or more Ansible playbooks to run (e.g., `workers`, `internal`, `jenkins`). Note that the `generic` playbook is implicit and applied globally to all builds.
+- **`delivery`**: The delivery method or destination environment, which dictates the cloud-init and boot structure. This argument expects exactly one of the mutually exclusive choices: `cloud`, `kvm`, or `pxe` (use `no` to omit all). For local development this argument should default to `no`.
+
+### Options
+
+- `--openstack`: Automatically convert and upload the built image to your OpenStack tenant. Ensure your OpenStack RC file credentials are sourced.
+- `--conda-env <path>`: Specifies a conda environment path containing `packer` and `qemu-img` binaries.
+- `--publish <key_path>`: Secure copy the resulting raw image to the static hosting site and adjust permissions.
+- `--dry-run`: Output the generated Packer and shell commands without executing them.
+- `-q`, `--quiet`: Supress the spinner output during build.
+
+Once the images are built and converted, a `.raw` output file will be available in the root directory.
+
+## Running VGCN images
 
-Please see https://github.com/usegalaxy-eu/terraform/ for examples of how to launch and configure this.
+Please see [https://github.com/usegalaxy-eu/terraform/](https://github.com/usegalaxy-eu/terraform/) for examples of how to launch and configure this.
diff --git a/ansible-roles/dj-wasabi.telegraf/.github/ISSUE_TEMPLATE/bug_report.md b/ansible-roles/dj-wasabi.telegraf/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index 03201270..00000000
--- a/ansible-roles/dj-wasabi.telegraf/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,35 +0,0 @@
----
-name: Bug report
-about: Help to improve this Ansible role.
-
----
-
-**Describe the bug**
-<!--- A clear and concise description of what the bug is. -->
-
-**Installation method/version**
-<!--- Please provide the installation method and version of the role. -->
-
-* Github / latest
-* Ansible Galaxy / 1.1.0
-
-**Ansible Version**
-
-```
-<!--- Paste output from "ansible --version" -->
-```
-
-**Targetted hosts**
-Concerns the following OS(es):
-<!--- Pick one below and delete the rest -->
-
-* Ubuntu
-* Debian
-* CentOS
-* Mint
-
-**Expected behavior**
-<!--- A clear and concise description of what you expected to happen. -->
-
-**Additional context**
-<!--- Add any other context about the problem here. Configuration of the role/group_vars information etc. -->
diff --git a/ansible-roles/dj-wasabi.telegraf/.github/ISSUE_TEMPLATE/feature_request.md b/ansible-roles/dj-wasabi.telegraf/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index 08c83431..00000000
--- a/ansible-roles/dj-wasabi.telegraf/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,14 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this Ansible role
-
----
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.
diff --git a/ansible-roles/dj-wasabi.telegraf/.gitignore b/ansible-roles/dj-wasabi.telegraf/.gitignore
deleted file mode 100644
index d52963b9..00000000
--- a/ansible-roles/dj-wasabi.telegraf/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-.idea
-.molecule
-tests/.cache
-.cache
-__pycache__
-*.retry
-pmip
diff --git a/ansible-roles/dj-wasabi.telegraf/.travis.yml b/ansible-roles/dj-wasabi.telegraf/.travis.yml
deleted file mode 100644
index 86a0c657..00000000
--- a/ansible-roles/dj-wasabi.telegraf/.travis.yml
+++ /dev/null
@@ -1,15 +0,0 @@
----
-sudo: required
-language: python
-services:
-  - docker
-
-install:
-  - pip install -r requirements.txt
-
-script:
-  - molecule --version
-  - ansible --version
-  - molecule test
-notifications:
-  webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/ansible-roles/dj-wasabi.telegraf/CHANGELOG.md b/ansible-roles/dj-wasabi.telegraf/CHANGELOG.md
deleted file mode 100644
index d9d022c8..00000000
--- a/ansible-roles/dj-wasabi.telegraf/CHANGELOG.md
+++ /dev/null
@@ -1,108 +0,0 @@
-dj-wasabi.telegraf
-------------------
-
-Below an overview of all changes in the releases.
-
-Version (Release date)
-
-0.10.0 (2018-08-12)
-
-  * Updating to telegraf 1.7.3
-  * Fix Deprecation warnings #54
-  * Changed 'include' to 'include_tasks' to remove deprecation warning #53 (By pull request: tjend (Thanks!))
-  * Add option to remove extra plugin config files #52 (By pull request: tjend (Thanks!))
-  * Plugins extra hash allow multiple inputs same type #50 (By pull request: tjend (Thanks!))
-  * Using specific version for tests
-  * Update minimum Ansible version to 2.4
-
-0.9.0 (2018-05-06)
-
-  * plugins: be able to specify the filename of extra plugings #40 (By pull request: gaelL (Thanks!))
-  * Fix markdown #41 (By pull request: Angristan (Thanks!))
-  * Allow to override RedHat release version #43 (By pull request: tszym (Thanks!))
-  * Improved comments, split up role, moved tags and added defaults #45 (By pull request: boxrick (Thanks!))
-  * Fix Travis Tests #42
-  * Convert the telegraf_plugins_extra varaible to a hash so that we can … #46 (By pull request: tjend (Thanks!))
-
-0.8.0 (2017-10-30)
-
-  * Updating to Molecule V2
-  * Test if LSB codename exists before using it #35 (By pull request: tszym (Thanks!))
-  * Remove useless packages on RedHat. fix #28 #36 (By pull request: tszym (Thanks!))
-  * Fix extra plugins by file / Change apt source filename / Change tags by global_tags #37 (By pull request: aarnaud (Thanks!))
-  * Use telegra_global_tags for oldest telegraf versions #38 (By pull request: tszym (Thanks!))
-
-0.7.0 (2017-02-23)
-
-  * Replace action by modules #26 (By pull request: tszym (Thanks!))
-  * Use yum repository to install telegraf on RedHat #25 (By pull request: tszym (Thanks!))
-  * Remove for-loop in extra-plugin template #24 (By pull request: emersondispatch (Thanks!))
-  * Update Debian.yml #23 (By pull request: zend0 (Thanks!))
-  * extra plugins tags #21 (By pull request: oboukili (Thanks!))
-  * Input tags support #20 (By pull request: szibis (Thanks!))
-  * Fix telegraf confguration permissions #19 (By pull request: szibis (Thanks!))
-
-0.6.0 (2017-01-02)
-
-  * Fix the Influxdb repo for "hybrid" debian distros (like "jessie/sid") #9 (By pull request: Ismael (Thanks!))
-  * Do "become" for the steps that require root access on Debian #10 (By pull request: Ismael (Thanks!))
-  * Fix the Influxdb repo for "hybrid" debian distros (like "jessie/sid") #11 (By pull request: Ismael (Thanks!))
-  * Removed imports #12
-  * Fixing molecule #15
-  * set telegraf hostname in defaults. #13 (By pull request: romainbureau (Thanks!))
-  * use version_compare filter … #14 (By pull request: lhoss (Thanks!))
-  * support missing agent settings upto telegraf v1.1 #16 (By pull request: lhoss (Thanks!))
-  * update the README with the latest v0.13 - v1.1 agent settings #17 (By pull request: lhoss (Thanks!))
-
-0.5.1 (2016-08-24)
-
-  * fixed issue with ansible not getting the package #6 (By pull request: thecodeassassin (Thanks!))
-
-0.5.0 (2016-07-17)
-
-  * Removed Test Kitchen tests
-  * Added Molecule tests and travis make use of them
-  * Updated default version to 1.0.0 beta2
-  * Feature/add extra plugins to telegrafd folder #5 (By pull request: stvnwrgs (Thanks!))
-
-0.4.0 (2016-02-05)
-
-  * Fixed test for test-kitchen
-  * Added travis-ci test for testing default installation when PR is made
-  * Fixed Download url for Debian
-  * Removed default entry for telegraf_plugins_extra
-
-0.3.0 (2016-01-13)
-
-  * Made it work with telegraf 0.10.0
-  * Default installation: 0.10.0
-
-0.2.0 (2015-11-14)
-
-  * Fixed kitchen test setup
-  * Adding "net" to the telegraf_plugins_default property
-  * Update etc-opt-telegraf-telegraf.conf.j2 #2 (By pull request: aferrari-technisys (Thanks!))
-  * Improvement and upgrade for v0.2.0 of telegraf #1 (By pull request: aferrari-technisys (Thanks!))
-
-0.1.0 (2015-09-23)
-
-  * Updated `telegraf_agent_version` to 0.1.9
-  * Added restart when package is changed (When updated for example)
-  * Added several plugin options:
-    * pass
-    * drop
-    * tagpass
-    * tagdrop
-    * interval
-  * Updated documentation
-  
-
-0.0.2 (2015-09-20)
-
-  * Updated README dus to missing colon
-  * Forgot to update the meta file
-  * Added Changelog file
-
-0.0.1 (2015-09-20)
-
-  * Initial release
diff --git a/ansible-roles/dj-wasabi.telegraf/CODE_OF_CONDUCT.md b/ansible-roles/dj-wasabi.telegraf/CODE_OF_CONDUCT.md
deleted file mode 100644
index e28ac17f..00000000
--- a/ansible-roles/dj-wasabi.telegraf/CODE_OF_CONDUCT.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Code of Conduct
-
-The Code of Conduct from Ansible found [here](https://docs.ansible.com/ansible/devel/community/code_of_conduct.html) applies to this Ansible role as well.
diff --git a/ansible-roles/dj-wasabi.telegraf/CONTRIBUTING.md b/ansible-roles/dj-wasabi.telegraf/CONTRIBUTING.md
deleted file mode 100644
index 4b8af376..00000000
--- a/ansible-roles/dj-wasabi.telegraf/CONTRIBUTING.md
+++ /dev/null
@@ -1,88 +0,0 @@
-# Contributing to this role
-
-**Table of content**
-
-- [Contributing to this role](#contributing-to-this-role)
-  * [Contributing](#contributing)
-  * [(local) Development](#-local--development)
-    + [Requirements](#requirements)
-    + [Execution](#execution)
-- [Other](#other)
-  * [Virtualenv](#virtualenv)
-  * [Links](#links)
-
-Thank you very much for making time to improve this Ansible role.
-
-## Contributing
-
-Please note that this project is released with a Contributor Code of Conduct. By participating in this project you agree to abide by its terms. [Contributor Code of Conduct](https://docs.ansible.com/ansible/devel/community/code_of_conduct.html).
-
-1. Fork the repo
-
-2. Create a branch and apply your changes to this branch.
-
-    a. Make sure you have updated the documentation when adding new variables;
-    
-    b. Don't forget to add/update tests so we can test the functionality during each Pull Request;
-    
-    c. Make sure the tests will succeed.
-
-3. Push the branch to your fork and submit a pull request.
-
-**Note**
-
-Pull Requests that fails during the tests will not be merged.
-
-## Coding Guidelines
-
-Style guides are important because they ensure consistency in the content, look, and feel of a book or a website.
-
-* [Ansible Style Guide](http://docs.ansible.com/ansible/latest/dev_guide/style_guide/)
-* It's "Ansible" when referring to the product and ``ansible`` when referring to the command  line tool, package, etc
-* Playbooks should be written in multi-line YAML with ``key: value``. The form ``key=value`` is only for ``ansible`` ad-hoc, not for ``ansible-playbook``.
-* Tasks should always have a ``name:``
-
-## (local) Development
-
-This role make use of Molecule to test the execution of the role and verificate it. In the root of the repository, a file named `requirements.txt` exists and contains the versions used by the tests.
-
-### Requirements
-
-You can install them with the following command:
-
-```
-pip install -r requirements.txt
-```
-
-Once the dependencies are installed, please install Docker as Molecule is configured in this repository to create Docker containers. See [this](https://docs.docker.com/install/) link to install Docker on your system.
-
-### Execution
-
-Once everything is installed, you can validate your changes by executing:
-```
-molecule test
-```
-
-It should run without any issues.
-
-# Other
-
-## Virtualenv
-
-Suggestion is to create a virtualenv so you won't have issues with other projects.
-
-Some web pages describing for virtual env:
-
-* http://thepythonguru.com/python-virtualenv-guide/
-* https://realpython.com/python-virtual-environments-a-primer/
-* https://www.dabapps.com/blog/introduction-to-pip-and-virtualenv-python/
-
-## Links
-
-[Molecule](https://molecule.readthedocs.io/)
-
-[Ansible](https://www.ansible.com/)
-
-[Molecule V2 with your own role](https://werner-dijkerman.nl/2017/09/05/using-molecule-v2-to-test-ansible-roles/)
-
-**End note**: Have fun making changes. If a feature helps you, then others find it helpful too and I will happily have it merged. 
diff --git a/ansible-roles/dj-wasabi.telegraf/LICENSE b/ansible-roles/dj-wasabi.telegraf/LICENSE
deleted file mode 100644
index 6922fb32..00000000
--- a/ansible-roles/dj-wasabi.telegraf/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2018 Werner Dijkerman
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/ansible-roles/dj-wasabi.telegraf/PULL_REQUEST_TEMPLATE.md b/ansible-roles/dj-wasabi.telegraf/PULL_REQUEST_TEMPLATE.md
deleted file mode 100644
index 70c5edef..00000000
--- a/ansible-roles/dj-wasabi.telegraf/PULL_REQUEST_TEMPLATE.md
+++ /dev/null
@@ -1,12 +0,0 @@
-**Description of PR**
-<!--- Describe what the PR holds -->
-
-**Type of change**
-<!--- Pick one below and delete the rest: -->
-
-Feature Pull Request
-Bugfix Pull Request
-Docs Pull Request
-
-**Fixes an issue**
-<!--- If this PR fixes an issue, please mention it. -->
diff --git a/ansible-roles/dj-wasabi.telegraf/README.md b/ansible-roles/dj-wasabi.telegraf/README.md
deleted file mode 100644
index 5b65c891..00000000
--- a/ansible-roles/dj-wasabi.telegraf/README.md
+++ /dev/null
@@ -1,169 +0,0 @@
-# dj-wasabi.telegraf
-
-## Build status:
-
-[![Build Status](https://travis-ci.org/dj-wasabi/ansible-telegraf.svg?branch=master)](https://travis-ci.org/dj-wasabi/ansible-telegraf)
-
-This role will install and configure telegraf.
-
-Telegraf is an agent written in Go for collecting metrics from the system it's running on, or from other services, and writing them into InfluxDB.
-
-Design goals are to have a minimal memory footprint with a plugin system so that developers in the community can easily add support for collecting metrics from well known services (like Hadoop, Postgres, or Redis) and third party APIs (like Mailchimp, AWS CloudWatch, or Google Analytics).
-
-(https://github.com/influxdb/telegraf)
-
-## Requirements
-
-
-No requirements. (Yes, an Influxdb server somewhere on the network will help though ;-) )
-
-## Upgrade
-### 0.7.0
-
-There was an issue:
-
-    If I configure a telegraf_plugins_extra, run ansible, delete the plugin and run ansible again, the plugin stays on the machine.
-
-
-
-## Role Variables
-
-The following parameters can be set for the Telegraf agent:
-
-* `telegraf_agent_version`: The version of Telegraf to install. Default: `1.0.0`
-* `telegraf_agent_interval`: The interval configured for sending data to the server. Default: `10`
-* `telegraf_agent_debug`: Run Telegraf in debug mode. Default: `False`
-* `telegraf_agent_round_interval`: Rounds collection interval to 'interval' Default: True
-* `telegraf_agent_flush_interval`: Default data flushing interval for all outputs. Default: 10
-* `telegraf_agent_flush_jitter`: Jitter the flush interval by a random amount. Default: 0
-* `telegraf_agent_aws_tags`: Configure AWS ec2 tags into Telegraf tags section Default: `False`
-* `telegraf_agent_aws_tags_prefix`: Define a prefix for AWS ec2 tags. Default: `""`
-* `telegraf_agent_collection_jitter`: Jitter the collection by a random amount. Default: 0 (since v0.13)
-* `telegraf_agent_metric_batch_size`: The agent metric batch size. Default: 1000  (since v0.13)
-* `telegraf_agent_metric_buffer_limit`: The agent metric buffer limit. Default: 10000  (since v0.13)
-* `telegraf_agent_quiet`: Run Telegraf in quiet mode (error messages only). Default: `False` (since v0.13)
-* `telegraf_agent_logfile`: The agent logfile name. Default: '' (means to log to stdout) (since v1.1)
-* `telegraf_agent_omit_hostname`: Do no set the "host" tag in the agent. Default: `False` (since v1.1)
-
-Full agent settings reference: https://github.com/influxdata/telegraf/blob/master/docs/CONFIGURATION.md#agent-configuration
-
-You can set tags for the host running telegraf:
-
-	telegraf_global_tags:
-	  - tag_name: some_name
-	    tag_value: some_value
-
-Specifying an output. The default is set to localhost, you'll have to specify the correct influxdb server:
-
-	telegraf_agent_output:
-	  - type: influxdb
-	    config:
-	      - urls = ["http://localhost:8086"]
-	      - database = "telegraf"
-            tagpass:
-              - diskmetrics = ["true"]
-
-The config will be printed line by line into the configuration, so you could also use:
-
-	config:
-		- # Print an documentation line
-
-and it will be printed in the configuration file.
-
-There are two properties which are similar, but are used differently. Those are:
-
-* `telegraf_plugins_default`
-* `telegraf_plugins_extra`
-
-With the property `telegraf_plugins_default` it is set to use the default set of Telegraf plugins. You could override it with more plugins, which should be enabled at default.
-
-	telegraf_plugins_default:
-	  - plugin: cpu
-	    config:
-	      - percpu = true
-	  - plugin: disk
-	  - plugin: io
-	  - plugin: mem
-	  - plugin: system
-	  - plugin: swap
-	  - plugin: netstat
-
-Every telegraf agent has these as a default configuration.
-
-The 2nd parameter `telegraf_plugins_extra` can be used to add plugins specific to the servers goal. It is a hash instead of a list, so that you can merge values from multiple var files together. Following is an example for using this parameter for MySQL database servers:
-
-	cat group_vars/mysql_database
-	telegraf_plugins_extra:
-		mysql:
-		  config:
-		  	- servers = ["root:{{ mysql_root_password }}@tcp(localhost:3306)/"]
-
-
-Telegraf plugin options:
-
-* `tags` An k/v tags to apply to a specific input's measurements. Can be used on any stage for better filtering for example in outputs.
-* `pass`: An array of strings that is used to filter metrics generated by the current plugin. Each string in the array is tested as a prefix against metric names and if it matches, the metric is emitted.
-* `drop`: The inverse of pass, if a metric name matches, it is not emitted.
-* `tagpass`: (added in Telegraf 0.1.5) tag names and arrays of strings that are used to filter metrics by the current plugin. Each string in the array is tested as an exact match against the tag name, and if it matches the metric is emitted.
-* `tagdrop`: (added in Telegraf 0.1.5) The inverse of tagpass. If a tag matches, the metric is not emitted. This is tested on metrics that have passed the tagpass test.
-* `interval`: How often to gather this metric. Normal plugins use a single global interval, but if one particular plugin should be run less or more often, you can configure that here.
-
-An example might look like this:
-
-	telegraf_plugins_default:
-	  - plugin: disk
-	    interval: 12
-            tags:
-                - diskmetrics = "true"
-	    tagpass:
-	      - fstype = [ "ext4", "xfs" ]
-    	  - path = [ "/opt", "/home" ]
-
-
-
-## Dependencies
-
-No dependencies
-
-## Example Playbook
-
-    - hosts: servers
-      roles:
-         - { role: dj-wasabi.telegraf }
-
-## Contributors
-
-The following have contributed to this Ansible role:
-
- * Thomas Szymanski
- * Alejandro
- * Slawomir Skowron
- * Ismael
- * Laurent Hoss
- * Anthony ARNAUD
- * Rick Box
- * Emerson Knapp
- * gaelL
- * Steven Wirges
- * zend0
- * Angristan
- * Olivier Boukili
- * Romain BUREAU
- * TheCodeAssassin
- * tjend
-
-Thank you all!
-
-## Molecule
-
-This roles is configured to be tested with Molecule. You can find on this page some more information regarding Molecule: https://werner-dijkerman.nl/2016/07/10/testing-ansible-roles-with-molecule-testinfra-and-docker/
-
-## License
-
-BSD
-
-## Author Information
-
-Please let me know if you have issues. Pull requests are also accepted! :-)
-
-mail: ikben [ at ] werner-dijkerman . nl
diff --git a/ansible-roles/dj-wasabi.telegraf/defaults/main.yml b/ansible-roles/dj-wasabi.telegraf/defaults/main.yml
deleted file mode 100644
index bd799c9c..00000000
--- a/ansible-roles/dj-wasabi.telegraf/defaults/main.yml
+++ /dev/null
@@ -1,52 +0,0 @@
----
-# defaults file for ansible-telegraf
-
-telegraf_agent_version: 1.7.3
-telegraf_agent_hostname: "{{ ansible_fqdn }}"
-telegraf_agent_interval: 10
-telegraf_agent_debug: False
-telegraf_agent_round_interval: True
-telegraf_agent_flush_interval: 10
-telegraf_agent_flush_jitter: 0
-telegraf_agent_aws_tags: False
-telegraf_agent_aws_tags_prefix: ""
-
-# v0.13 settings (not sure if supported in older version):
-telegraf_agent_collection_jitter: 0
-telegraf_agent_metric_batch_size: 1000
-telegraf_agent_metric_buffer_limit: 10000
-telegraf_agent_quiet: False
-
-# v1.1 settings:
-telegraf_agent_logfile: ""
-telegraf_agent_omit_hostname: False
-
-telegraf_global_tags: []
-
-telegraf_agent_output:
-  - type: influxdb
-    config:
-      - urls = ["http://localhost:8086"]
-      - database = "telegraf"
-      - precision = "s"
-
-# defaults - /etc/telegraf/telegraf.conf
-telegraf_plugins_default:
-  - plugin: cpu
-    config:
-      - percpu = true
-  - plugin: disk
-  - plugin: io
-  - plugin: mem
-  - plugin: net
-  - plugin: system
-  - plugin: swap
-  - plugin: netstat
-  - plugin: processes
-  - plugin: kernel
-
-# extra configuration - /etc/telegraf/telegraf.d/*
-telegraf_plugins_extra: {}
-
-# RedHat specific settings for convenience
-telegraf_redhat_releasever: "$releasever"
diff --git a/ansible-roles/dj-wasabi.telegraf/handlers/main.yml b/ansible-roles/dj-wasabi.telegraf/handlers/main.yml
deleted file mode 100644
index 78a82a72..00000000
--- a/ansible-roles/dj-wasabi.telegraf/handlers/main.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-# handlers file for ansible-telegraf
-
-- name: "Restart Telegraf"
-  service:
-    name: telegraf
-    state: restarted
-    enabled: yes
-  become: yes
diff --git a/ansible-roles/dj-wasabi.telegraf/meta/.galaxy_install_info b/ansible-roles/dj-wasabi.telegraf/meta/.galaxy_install_info
deleted file mode 100644
index f229fa4f..00000000
--- a/ansible-roles/dj-wasabi.telegraf/meta/.galaxy_install_info
+++ /dev/null
@@ -1 +0,0 @@
-{install_date: 'Mon Sep 17 11:27:03 2018', version: 0.10.0}
diff --git a/ansible-roles/dj-wasabi.telegraf/meta/main.yml b/ansible-roles/dj-wasabi.telegraf/meta/main.yml
deleted file mode 100644
index 016e57c5..00000000
--- a/ansible-roles/dj-wasabi.telegraf/meta/main.yml
+++ /dev/null
@@ -1,20 +0,0 @@
----
-galaxy_info:
-  author: Werner Dijkerman
-  description: Installing and configuring Telegraf
-  company:
-  license: license BSD
-  min_ansible_version: 2.4
-  platforms:
-    - name: EL
-      versions:
-        - all
-    - name: Ubuntu
-      versions:
-        - all
-    - name: Debian
-      versions:
-        - all
-  categories:
-    - monitoring
-dependencies: []
diff --git a/ansible-roles/dj-wasabi.telegraf/molecule/default/Dockerfile.j2 b/ansible-roles/dj-wasabi.telegraf/molecule/default/Dockerfile.j2
deleted file mode 100644
index 7ba209c3..00000000
--- a/ansible-roles/dj-wasabi.telegraf/molecule/default/Dockerfile.j2
+++ /dev/null
@@ -1,7 +0,0 @@
-FROM {{ item.image }}
-
-RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get upgrade -y && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
-    elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python python-devel python2-dnf bash && dnf clean all; \
-    elif [ $(command -v yum) ]; then yum makecache fast && yum update -y && yum install -y python sudo yum-plugin-ovl bash && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
-    elif [ $(command -v zypper) ]; then zypper refresh && zypper update -y && zypper install -y python sudo bash python-xml && zypper clean -a; \
-    elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates; fi
diff --git a/ansible-roles/dj-wasabi.telegraf/molecule/default/INSTALL.rst b/ansible-roles/dj-wasabi.telegraf/molecule/default/INSTALL.rst
deleted file mode 100644
index 09e87359..00000000
--- a/ansible-roles/dj-wasabi.telegraf/molecule/default/INSTALL.rst
+++ /dev/null
@@ -1,46 +0,0 @@
-*******
-Install
-*******
-
-This set of playbooks have specific dependencies on Ansible due to the modules
-being used.
-
-Requirements
-============
-
-* Ansible 2.2
-* Docker Engine
-* docker-py
-
-Install OS dependencies on CentOS 7
-
-.. code-block:: bash
-
-  $ sudo yum install -y epel-release
-  $ sudo yum install -y gcc python-pip python-devel openssl-devel
-  # If installing Molecule from source.
-  $ sudo yum install libffi-devel git
-
-Install OS dependencies on Ubuntu 16.x
-
-.. code-block:: bash
-
-  $ sudo apt-get update
-  $ sudo apt-get install -y python-pip libssl-dev docker-engine
-  # If installing Molecule from source.
-  $ sudo apt-get install -y libffi-dev git
-
-Install OS dependencies on Mac OS
-
-.. code-block:: bash
-
-  $ brew install python
-  $ brew install git
-
-Install using pip:
-
-.. code-block:: bash
-
-  $ sudo pip install ansible
-  $ sudo pip install docker-py
-  $ sudo pip install molecule --pre
diff --git a/ansible-roles/dj-wasabi.telegraf/molecule/default/create.yml b/ansible-roles/dj-wasabi.telegraf/molecule/default/create.yml
deleted file mode 100644
index eca41c5a..00000000
--- a/ansible-roles/dj-wasabi.telegraf/molecule/default/create.yml
+++ /dev/null
@@ -1,47 +0,0 @@
----
-- name: Create
-  hosts: localhost
-  connection: local
-  gather_facts: False
-  no_log: "{{ not lookup('env', 'MOLECULE_DEBUG') | bool }}"
-  vars:
-    molecule_file: "{{ lookup('env', 'MOLECULE_FILE') }}"
-    molecule_ephemeral_directory: "{{ lookup('env', 'MOLECULE_EPHEMERAL_DIRECTORY') }}"
-    molecule_scenario_directory: "{{ lookup('env', 'MOLECULE_SCENARIO_DIRECTORY') }}"
-    molecule_yml: "{{ lookup('file', molecule_file) | from_yaml }}"
-  tasks:
-    - name: Create Dockerfiles from image names
-      template:
-        src: "{{ molecule_scenario_directory }}/Dockerfile.j2"
-        dest: "{{ molecule_ephemeral_directory }}/Dockerfile_{{ item.image | regex_replace('[^a-zA-Z0-9_]', '_') }}"
-      with_items: "{{ molecule_yml.platforms }}"
-      register: platforms
-
-    - name: Discover local Docker images
-      docker_image_facts:
-        name: "molecule_local/{{ item.item.name }}"
-      with_items: "{{ platforms.results }}"
-      register: docker_images
-
-    - name: Build an Ansible compatible image
-      docker_image:
-        path: "{{ molecule_ephemeral_directory }}"
-        name: "molecule_local/{{ item.item.image }}"
-        dockerfile: "{{ item.item.dockerfile | default(item.invocation.module_args.dest) }}"
-        force: "{{ item.item.force | default(True) }}"
-      with_items: "{{ platforms.results }}"
-      when: platforms.changed or docker_images.results | map(attribute='images') | select('equalto', []) | list | count >= 0
-
-    - name: Create molecule instance(s)
-      docker_container:
-        name: "{{ item.name }}"
-        hostname: "{{ item.name }}"
-        image: "molecule_local/{{ item.image }}"
-        state: started
-        recreate: False
-        log_driver: none
-        command: "{{ item.command | default('sleep infinity') }}"
-        privileged: "{{ item.privileged | default(omit) }}"
-        volumes: "{{ item.volumes | default(omit) }}"
-        capabilities: "{{ item.capabilities | default(omit) }}"
-      with_items: "{{ molecule_yml.platforms }}"
diff --git a/ansible-roles/dj-wasabi.telegraf/molecule/default/destroy.yml b/ansible-roles/dj-wasabi.telegraf/molecule/default/destroy.yml
deleted file mode 100644
index 63b5edf9..00000000
--- a/ansible-roles/dj-wasabi.telegraf/molecule/default/destroy.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-- name: Destroy
-  hosts: localhost
-  connection: local
-  gather_facts: False
-  no_log: "{{ not lookup('env', 'MOLECULE_DEBUG') | bool }}"
-  vars:
-    molecule_file: "{{ lookup('env', 'MOLECULE_FILE') }}"
-    molecule_yml: "{{ lookup('file', molecule_file) | from_yaml }}"
-  tasks:
-    - name: Destroy molecule instance(s)
-      docker_container:
-        name: "{{ item.name }}"
-        state: absent
-        force_kill: "{{ item.force_kill | default(True) }}"
-      with_items: "{{ molecule_yml.platforms }}"
diff --git a/ansible-roles/dj-wasabi.telegraf/molecule/default/molecule.yml b/ansible-roles/dj-wasabi.telegraf/molecule/default/molecule.yml
deleted file mode 100644
index 1ae3e205..00000000
--- a/ansible-roles/dj-wasabi.telegraf/molecule/default/molecule.yml
+++ /dev/null
@@ -1,33 +0,0 @@
----
-dependency:
-  name: galaxy
-driver:
-  name: docker
-lint:
-  name: yamllint
-  options:
-    config-file: molecule/default/yaml-lint.yml
-
-platforms:
-  - name: telegraf-centos
-    image: milcom/centos7-systemd
-    privileged: True
-  - name: telegraf-debian
-    image: minimum2scp/systemd-stretch
-    privileged: True
-    command: /sbin/init
-  - name: telegraf-ubuntu
-    image: solita/ubuntu-systemd:bionic
-    privileged: True
-    command: /sbin/init
-
-provisioner:
-  name: ansible
-  lint:
-    name: ansible-lint
-scenario:
-  name: default
-verifier:
-  name: testinfra
-  lint:
-    name: flake8
diff --git a/ansible-roles/dj-wasabi.telegraf/molecule/default/playbook.yml b/ansible-roles/dj-wasabi.telegraf/molecule/default/playbook.yml
deleted file mode 100644
index dd38a776..00000000
--- a/ansible-roles/dj-wasabi.telegraf/molecule/default/playbook.yml
+++ /dev/null
@@ -1,22 +0,0 @@
----
-- hosts: all
-  pre_tasks:
-    - name: "Installing which on CentOS"
-      yum:
-        name: which
-        state: present
-      when:
-        - ansible_os_family == 'RedHat'
-
-    - name: "Installing wget on Debian"
-      apt:
-        name: "{{ item }}"
-        state: present
-      when:
-        - ansible_os_family == 'Debian'
-      with_items:
-        - wget
-        - gpg
-
-  roles:
-    - role: ansible-telegraf
diff --git a/ansible-roles/dj-wasabi.telegraf/molecule/default/tests/test_default.py b/ansible-roles/dj-wasabi.telegraf/molecule/default/tests/test_default.py
deleted file mode 100644
index fe5e7696..00000000
--- a/ansible-roles/dj-wasabi.telegraf/molecule/default/tests/test_default.py
+++ /dev/null
@@ -1,26 +0,0 @@
-import os
-
-import testinfra.utils.ansible_runner
-
-testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
-    os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('all')
-
-
-def test_telegraf_running_and_enabled(Service, SystemInfo):
-    telegraf = Service("telegraf")
-    assert telegraf.is_enabled
-    if SystemInfo.distribution == 'centos':
-        assert telegraf.is_running
-
-
-def test_telegraf_dot_conf(File):
-    telegraf = File("/etc/telegraf/telegraf.conf")
-    assert telegraf.user == "telegraf"
-    assert telegraf.group == "telegraf"
-    assert telegraf.mode == 0o640
-    assert telegraf.contains('[[inputs.cpu]]')
-
-
-def test_telegraf_package(Package, SystemInfo):
-    telegraf = Package('telegraf')
-    assert telegraf.is_installed
diff --git a/ansible-roles/dj-wasabi.telegraf/molecule/default/tests/test_default.pyc b/ansible-roles/dj-wasabi.telegraf/molecule/default/tests/test_default.pyc
deleted file mode 100644
index 4864f179..00000000
Binary files a/ansible-roles/dj-wasabi.telegraf/molecule/default/tests/test_default.pyc and /dev/null differ
diff --git a/ansible-roles/dj-wasabi.telegraf/molecule/default/yaml-lint.yml b/ansible-roles/dj-wasabi.telegraf/molecule/default/yaml-lint.yml
deleted file mode 100644
index cd377bf6..00000000
--- a/ansible-roles/dj-wasabi.telegraf/molecule/default/yaml-lint.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-extends: default
-
-rules:
-  line-length:
-    max: 140
-    level: warning
-  truthy: disable
diff --git a/ansible-roles/dj-wasabi.telegraf/requirements.txt b/ansible-roles/dj-wasabi.telegraf/requirements.txt
deleted file mode 100644
index f3b20214..00000000
--- a/ansible-roles/dj-wasabi.telegraf/requirements.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-ansible==2.4.4.0
-docker==3.3.0
-molecule==2.13.1
-testinfra==1.12.0
diff --git a/ansible-roles/dj-wasabi.telegraf/tasks/Debian.yml b/ansible-roles/dj-wasabi.telegraf/tasks/Debian.yml
deleted file mode 100644
index d07077d4..00000000
--- a/ansible-roles/dj-wasabi.telegraf/tasks/Debian.yml
+++ /dev/null
@@ -1,42 +0,0 @@
----
-
-- name: Ensure the system can use the HTTPS transport for APT.
-  stat:
-    path: /usr/lib/apt/methods/https
-  register: apt_https_transport
-
-- name: Install APT HTTPS transport.
-  apt:
-    name: "apt-transport-https"
-    state: present
-  when: not apt_https_transport.stat.exists
-  become: yes
-
-- name: Download Telegraf apt key.
-  apt_key:
-    url: "https://repos.influxdata.com/influxdb.key"
-    state: present
-  become: yes
-
-- name: Add Telegraf repository (using LSB).
-  apt_repository:
-    repo: "deb https://repos.influxdata.com/{{ ansible_distribution|lower }} {{ ansible_lsb.codename }} stable"
-    filename: "telegraf"
-    state: present
-  become: yes
-  when: ansible_lsb is defined and ansible_lsb.codename is defined
-
-- name: Add Telegraf repository.
-  apt_repository:
-    repo: "deb https://repos.influxdata.com/{{ ansible_distribution|lower }} {{ ansible_distribution_release }} stable"
-    filename: "telegraf"
-    state: present
-  become: yes
-  when: ansible_lsb is not defined or ansible_lsb.codename is not defined
-
-- name: "Install telegraf package | Debian"
-  apt:
-    name: "telegraf"
-    state: present
-  notify: "Restart Telegraf"
-  become: yes
diff --git a/ansible-roles/dj-wasabi.telegraf/tasks/RedHat.yml b/ansible-roles/dj-wasabi.telegraf/tasks/RedHat.yml
deleted file mode 100644
index f43df738..00000000
--- a/ansible-roles/dj-wasabi.telegraf/tasks/RedHat.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-# description: RedHat specific installation
-
-- name: "Add yum repository | RedHat"
-  yum_repository:
-    name: influxdb
-    description: InfluxDB Repository - RHEL $releasever
-    baseurl: "https://repos.influxdata.com/rhel/{{ telegraf_redhat_releasever }}/$basearch/stable"
-    gpgcheck: yes
-    gpgkey: https://repos.influxdata.com/influxdb.key
-
-- name: "Install telegraf package | RedHat"
-  yum:
-    name: "telegraf-{{ telegraf_agent_version }}"
-    state: installed
-  notify: "Restart Telegraf"
diff --git a/ansible-roles/dj-wasabi.telegraf/tasks/configure.yml b/ansible-roles/dj-wasabi.telegraf/tasks/configure.yml
deleted file mode 100644
index 1fdb6f2b..00000000
--- a/ansible-roles/dj-wasabi.telegraf/tasks/configure.yml
+++ /dev/null
@@ -1,60 +0,0 @@
----
-# description: Configure telegraf and get all relevent ec2 information
-
-- name: Retrieve ec2 facts
-  ec2_metadata_facts:
-  when: telegraf_agent_aws_tags
-
-- name: Retrieve all ec2 tags on the instance
-  ec2_tag:
-    region: '{{ ansible_ec2_placement_region }}'
-    resource: '{{ ansible_ec2_instance_id }}'
-    state: list
-  when: telegraf_agent_aws_tags
-  register: ec2_tags
-
-- name: "Copy the template for versions < 0.10.0"
-  template:
-    src: etc-opt-telegraf-telegraf.conf.j2
-    dest: /etc/opt/telegraf/telegraf.conf
-    owner: telegraf
-    group: telegraf
-    mode: 0640
-  become: yes
-  when: telegraf_agent_version is version_compare('0.10.0', '<')
-  notify: "Restart Telegraf"
-
-- name: "Copy the template for versions >= 0.10.0"
-  template:
-    src: telegraf.conf.j2
-    dest: /etc/telegraf/telegraf.conf
-    owner: telegraf
-    group: telegraf
-    mode: 0640
-  become: yes
-  when: telegraf_agent_version is version_compare('0.10.0', '>=')
-  notify: "Restart Telegraf"
-
-- name: "Copy telegraf extra plugins"
-  template:
-    src: "telegraf-extra-plugin.conf.j2"
-    dest: "/etc/telegraf/telegraf.d/{{ item.key }}.conf"
-    owner: telegraf
-    group: telegraf
-    mode: 0640
-  with_dict: "{{ telegraf_plugins_extra }}"
-  when: "telegraf_plugins_extra is defined and telegraf_plugins_extra is iterable and item.value.state|default('present') != 'absent'"
-  become: yes
-  notify: "Restart Telegraf"
-
-- name: "Remove telegraf extra plugins"
-  file:
-    path: "/etc/telegraf/telegraf.d/{{ item.key }}.conf"
-    state: absent
-  with_dict: "{{ telegraf_plugins_extra }}"
-  when: "telegraf_plugins_extra is defined and telegraf_plugins_extra is iterable and item.value.state|default('present') == 'absent'"
-  become: yes
-  notify: "Restart Telegraf"
-
-- name: "Force restart service after reread config"
-  meta: flush_handlers
diff --git a/ansible-roles/dj-wasabi.telegraf/tasks/main.yml b/ansible-roles/dj-wasabi.telegraf/tasks/main.yml
deleted file mode 100644
index 0f850ef9..00000000
--- a/ansible-roles/dj-wasabi.telegraf/tasks/main.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-# tasks file for ansible-telegraf
-
-- name: "Install the correct repository"
-  include_tasks: "RedHat.yml"
-  when: ansible_os_family == "RedHat"
-
-- name: "Install the correct repository"
-  include_tasks: "Debian.yml"
-  when: ansible_os_family == "Debian"
-  tags:
-    - telegraf
-    - packages
-
-- name: "Configure telegraf"
-  include_tasks: "configure.yml"
diff --git a/ansible-roles/dj-wasabi.telegraf/templates/etc-opt-telegraf-telegraf.conf.j2 b/ansible-roles/dj-wasabi.telegraf/templates/etc-opt-telegraf-telegraf.conf.j2
deleted file mode 100644
index b6774b47..00000000
--- a/ansible-roles/dj-wasabi.telegraf/templates/etc-opt-telegraf-telegraf.conf.j2
+++ /dev/null
@@ -1,78 +0,0 @@
-### MANAGED BY {{ role_path|basename }} ANSIBLE ROLE ###
-
-[tags]
-{% if telegraf_global_tags is defined and telegraf_global_tags is iterable %}
-{% for item in telegraf_global_tags %}
-    {{ item.tag_name }} = "{{ item.tag_value }}"
-{% endfor %}
-{% endif %}
-
-{% if telegraf_agent_aws_tags == true and ec2_tags is defined and ec2_tags != None %}
-{% for key, value in ec2_tags.tags.items()%}
-   {{telegraf_agent_aws_tags_prefix}}{{ key }} = "{{ value }}"
-{% endfor %}
-{% endif %}
-
-# Configuration for telegraf itself
-[agent]
-    interval = "{{ telegraf_agent_interval }}s"
-    debug = {{ telegraf_agent_debug | lower }}
-    hostname = "{{ ansible_fqdn }}"
-
-# Configuration for influxdb server to send metrics to
-[outputs]
-{% if telegraf_agent_output is defined and telegraf_agent_output is iterable %}
-{% for item in telegraf_agent_output %}
-[outputs.{{ item.type }}]
-{% for items in item.config %}
-    {{ items }}
-{% endfor %}
-{% endfor %}
-{% endif %}
-
-# PLUGINS
-{% if telegraf_plugins_default is defined and telegraf_plugins_default is iterable %}
-{% for item in telegraf_plugins_default %}
-[{{ item.plugin }}]
-{% if item.interval is defined %}
-    interval = "{{ item.interval }}s"
-{% endif %}
-{% if item.config is defined and item.config is iterable %}
-{% for items in item.config %}
-    {{ items }}
-{% endfor %}
-{% endif %}
-{% if item.tagpass is defined and item.tagpass is iterable %}
-[{{ item.plugin }}.tagpass]
-{% for items in item.tagpass %}
-    {{ items }}
-{% endfor %}
-{% endif %}
-{% if item.tagdrop is defined and item.tagdrop is iterable %}
-[{{ item.plugin }}.tagdrop]
-{% for items in item.tagdrop %}
-    {{ items }}
-{% endfor %}
-{% endif %}
-{% if item.pass is defined and item.pass is iterable %}
-[{{ item.plugin }}.pass]
-{% for items in item.pass %}
-    {{ items }}
-{% endfor %}
-{% endif %}
-{% if item.drop is defined and item.drop is iterable %}
-[{{ item.plugin }}.drop]
-{% for items in item.drop %}
-    {{ items }}
-{% endfor %}
-{% endif %}
-{% if item.specifications is defined and item.specifications is iterable %}
-[[{{item.plugin}}.specifications]]
-{% for items in item.specifications %}
-    {{ items }}
-{% endfor %}
-{% endif %}
-
-
-{% endfor %}
-{% endif %}
diff --git a/ansible-roles/dj-wasabi.telegraf/templates/telegraf-extra-plugin.conf.j2 b/ansible-roles/dj-wasabi.telegraf/templates/telegraf-extra-plugin.conf.j2
deleted file mode 100644
index 452b722c..00000000
--- a/ansible-roles/dj-wasabi.telegraf/templates/telegraf-extra-plugin.conf.j2
+++ /dev/null
@@ -1,47 +0,0 @@
-### MANAGED BY {{ role_path|basename }} ANSIBLE ROLE ###
-
-[[inputs.{{ item.value.plugin | default(item.key) }}]]
-{% if item.value.interval is defined %}
-    interval = "{{ item.value.interval }}s"
-{% endif %}
-{% if item.value.config is defined and item.value.config is iterable %}
-{% for items in item.value.config %}
-    {{ items }}
-{% endfor %}
-{% endif %}
-{% if item.value.tags is defined and item.value.tags is iterable %}
-[inputs.{{ item.value.plugin | default(item.key) }}.tags]
-{% for items in item.value.tags %}
-    {{ items }}
-{% endfor %}
-{% endif %}
-{% if item.value.tagpass is defined and item.value.tagpass is iterable %}
-[{{ item.value.plugin | default(item.key) }}.tagpass]
-{% for items in item.value.tagpass %}
-    {{ items }}
-{% endfor %}
-{% endif %}
-{% if item.value.tagdrop is defined and item.value.tagdrop is iterable %}
-[{{ item.value.plugin | default(item.key) }}.tagdrop]
-{% for items in item.value.tagdrop %}
-    {{ items }}
-{% endfor %}
-{% endif %}
-{% if item.value.pass is defined and item.value.pass is iterable %}
-[{{ item.value.plugin | default(item.key) }}.pass]
-{% for items in item.value.pass %}
-    {{ items }}
-{% endfor %}
-{% endif %}
-{% if item.value.drop is defined and item.value.drop is iterable %}
-[{{ item.value.plugin | default(item.key) }}.drop]
-{% for items in item.value.drop %}
-    {{ items }}
-{% endfor %}
-{% endif %}
-{% if item.value.specifications is defined and item.value.specifications is iterable %}
-[[{{item.value.plugin | default(item.key)}}.specifications]]
-{% for items in item.value.specifications %}
-    {{ items }}
-{% endfor %}
-{% endif %}
diff --git a/ansible-roles/dj-wasabi.telegraf/templates/telegraf.conf.j2 b/ansible-roles/dj-wasabi.telegraf/templates/telegraf.conf.j2
deleted file mode 100644
index ba426a9e..00000000
--- a/ansible-roles/dj-wasabi.telegraf/templates/telegraf.conf.j2
+++ /dev/null
@@ -1,100 +0,0 @@
-### MANAGED BY {{ role_path|basename }} ANSIBLE ROLE ###
-
-[global_tags]
-{% if telegraf_global_tags is defined and telegraf_global_tags is iterable %}
-{% for item in telegraf_global_tags %}
-    {{ item.tag_name }} = "{{ item.tag_value }}"
-{% endfor %}
-{% endif %}
-
-{% if telegraf_agent_aws_tags == true and ec2_tags is defined and ec2_tags != None %}
-{% for key, value in ec2_tags.tags.items()%}
-   {{telegraf_agent_aws_tags_prefix}}{{ key }} = "{{ value }}"
-{% endfor %}
-{% endif %}
-
-# Configuration for telegraf agent
-[agent]
-    interval = "{{ telegraf_agent_interval }}s"
-    debug = {{ telegraf_agent_debug | lower }}
-    hostname = "{{ telegraf_agent_hostname }}"
-    round_interval = {{ telegraf_agent_round_interval | lower }}
-    flush_interval = "{{ telegraf_agent_flush_interval }}s"
-    flush_jitter = "{{ telegraf_agent_flush_jitter }}s"
-{% if telegraf_agent_version is version_compare('0.13', '>=') %}
-    collection_jitter = "{{ telegraf_agent_collection_jitter }}s"
-    metric_batch_size = {{ telegraf_agent_metric_batch_size }}
-    metric_buffer_limit = {{ telegraf_agent_metric_buffer_limit }}
-    quiet = {{ telegraf_agent_quiet | lower }}
-{% endif %}
-{% if telegraf_agent_version is version_compare('1.1', '>=') %}
-    logfile = "{{ telegraf_agent_logfile }}"
-    omit_hostname = {{ telegraf_agent_omit_hostname | lower }}
-{% endif %}
-
-###############################################################################
-#                                  OUTPUTS                                    #
-###############################################################################
-
-{% if telegraf_agent_output is defined and telegraf_agent_output is iterable %}
-{% for item in telegraf_agent_output %}
-[[outputs.{{ item.type }}]]
-{% for items in item.config %}
-    {{ items }}
-{% endfor %}
-{% endfor %}
-{% endif %}
-
-###############################################################################
-#                                  INPUTS                                     #
-###############################################################################
-
-{% if telegraf_plugins_default is defined and telegraf_plugins_default is iterable %}
-{% for item in telegraf_plugins_default %}
-[[inputs.{{ item.plugin }}]]
-{% if item.interval is defined %}
-    interval = "{{ item.interval }}s"
-{% endif %}
-{% if item.config is defined and item.config is iterable %}
-{% for items in item.config %}
-    {{ items }}
-{% endfor %}
-{% endif %}
-{% if item.tags is defined and item.tags is iterable %}
-[inputs.{{ item.plugin }}.tags]
-{% for items in item.tags %}
-    {{ items }}
-{% endfor %}
-{% endif %}
-{% if item.tagpass is defined and item.tagpass is iterable %}
-[{{ item.plugin }}.tagpass]
-{% for items in item.tagpass %}
-    {{ items }}
-{% endfor %}
-{% endif %}
-{% if item.tagdrop is defined and item.tagdrop is iterable %}
-[{{ item.plugin }}.tagdrop]
-{% for items in item.tagdrop %}
-    {{ items }}
-{% endfor %}
-{% endif %}
-{% if item.pass is defined and item.pass is iterable %}
-[{{ item.plugin }}.pass]
-{% for items in item.pass %}
-    {{ items }}
-{% endfor %}
-{% endif %}
-{% if item.drop is defined and item.drop is iterable %}
-[{{ item.plugin }}.drop]
-{% for items in item.drop %}
-    {{ items }}
-{% endfor %}
-{% endif %}
-{% if item.specifications is defined and item.specifications is iterable %}
-[[{{item.plugin}}.specifications]]
-{% for items in item.specifications %}
-    {{ items }}
-{% endfor %}
-{% endif %}
-{% endfor %}
-{% endif %}
diff --git a/ansible-roles/dynmotd/files/identicon.py b/ansible-roles/dynmotd/files/identicon.py
deleted file mode 100644
index 13d37bf1..00000000
--- a/ansible-roles/dynmotd/files/identicon.py
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/usr/bin/env python
-# encoding: utf-8
-# Based off of https://github.com/fdcore/python-iden-svg (MIT license)
-import sys
-import hashlib
-
-
-def colored(num, value, bg=False):
-    x = 48 if bg else 38
-    return '\x1b[{0};5;{1}m{2}\x1b[0m'.format(x, num, value)
-
-
-class Iden:
-    def build(self, h):
-        pixels = [[0 for _ in range(5)] for _ in range(5)]
-        for i in range(0, 5):
-            for x in range(0, 5):
-                pixels[x][i] = self.showPixel(i, x, h)
-        return pixels
-
-    def showPixel(self, x, y, h):
-        m = 6 + abs(2-x) * 5 + y
-        return int(h[m:m+1], 16) % 2 == 0
-
-    def getIcon(self, num, hash_string):
-        for x in self.build(hash_string):
-            yield ''.join([
-                colored(num, '██') if q else
-                colored((num + 15) % 255, '  ', bg=True)
-                for q in x
-            ])
-
-
-if __name__ == '__main__':
-    data = sys.stdin.read().strip()
-
-    m = hashlib.sha256()
-    m.update(data.encode('UTF-8'))
-    hash_string = m.hexdigest()
-    num = int(hash_string[0:2], 16)
-
-    for line in Iden().getIcon(num, hash_string):
-        print(line)
diff --git a/ansible-roles/dynmotd/tasks/main.yml b/ansible-roles/dynmotd/tasks/main.yml
deleted file mode 100644
index 224caa2e..00000000
--- a/ansible-roles/dynmotd/tasks/main.yml
+++ /dev/null
@@ -1,29 +0,0 @@
----
-- name: dynmotd file
-  template:
-    src: dynmotd.sh.j2
-    dest: /usr/bin/dynmotd
-    owner: root
-    group: root
-    mode: 0755
-
-- name: identicon script
-  copy:
-    src: identicon.py
-    dest: /usr/bin/identicon
-    owner: root
-    group: root
-    mode: 0755
-
-- name: add to profile
-  lineinfile:
-    path: /etc/profile
-    line: "/usr/bin/dynmotd"
-
-- name: Add tag file
-  template:
-    src: vgcn-release.j2
-    dest: /etc/vgcn-release
-    owner: root
-    group: root
-    mode: 0444
diff --git a/ansible-roles/dynmotd/templates/dynmotd.sh.j2 b/ansible-roles/dynmotd/templates/dynmotd.sh.j2
deleted file mode 100644
index a93330fc..00000000
--- a/ansible-roles/dynmotd/templates/dynmotd.sh.j2
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/bash
-data=$(hostname -f)
-icon="$(echo "$data" | /usr/bin/identicon)"
-color_fg=$((16#$(echo "$data" | tr -d '\n' | sha256sum | cut -c1-2)))
-color_bg=$(( color_fg + 15 ))
-bg="\033[48;5;${color_bg}m"
-fg="\033[38;5;${color_fg}m"
-clear="\033[0m"
-
-line() {
-	head -n $1 | tail -n 1
-}
-
-echo -e "${fg}${bg} ██╗   ██╗ ██████╗   ██████╗ ██████╗ ${clear} $(line 1 <<< "$icon")"
-echo -e "${fg}${bg} ██║   ██║██╔════╝  ██╔════╝ ██╔══██╗${clear} $(line 2 <<< "$icon")"
-echo -e "${fg}${bg} ╚██╗ ██╔╝██║  ███╗ ██║  ███╗██████╔╝${clear} $(line 3 <<< "$icon")"
-echo -e "${fg}${bg}  ╚████╔╝ ╚██████╔╝ ╚██████╔╝██╔═══╝ ${clear} $(line 4 <<< "$icon")"
-echo -e "${fg}${bg}   ╚═══╝   ╚═════╝   ╚═════╝ ╚═╝     ${clear} $(line 5 <<< "$icon")"
-echo "====================================================
-Hostname..........: `hostname -f`
-Release...........: `cat /etc/redhat-release`
-Build.............: VGGP build {{ cloud }} {{ build_tag }}
-Build Date........: {{ ansible_date_time.iso8601 }}
-====================================================
-Current user......: `whoami`
-Load..............: `cat /proc/loadavg`
-Uptime............: `uptime -p`
-{% for custom_command in dynmotd_custom %}
-{%set periods = custom_command.name | length%}
-{{ custom_command.name }}{%for i in range(18 - periods)%}.{% endfor %}: `{{ custom_command.command }}`
-{% endfor %}
-===================================================="
diff --git a/ansible-roles/dynmotd/templates/vgcn-release.j2 b/ansible-roles/dynmotd/templates/vgcn-release.j2
deleted file mode 100644
index 3d0681b0..00000000
--- a/ansible-roles/dynmotd/templates/vgcn-release.j2
+++ /dev/null
@@ -1 +0,0 @@
-{{ ansible_distribution }} {{ ansible_distribution_version }} VGGP {{ build_tag }}
diff --git a/ansible-roles/external.yml b/ansible-roles/external.yml
deleted file mode 100644
index a8c15e43..00000000
--- a/ansible-roles/external.yml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-- hosts: default
-  vars_files:
-    - "group_vars/all.yml"
-  roles:
-    - lock-root
-    - cloudinit
diff --git a/ansible-roles/galaxy/tasks/main.yml b/ansible-roles/galaxy/tasks/main.yml
deleted file mode 100644
index 11995c69..00000000
--- a/ansible-roles/galaxy/tasks/main.yml
+++ /dev/null
@@ -1,39 +0,0 @@
----
-- lineinfile:
-    path: /etc/group
-    regexp: 'input:x:999:'
-    line: 'input:x:500:'
-  when: replace_non_galaxy_999 is defined
-
-- command: "find / -gid 999 -exec chgrp 500 '{}' +"
-  ignore_errors: yes
-  when: replace_non_galaxy_999 is defined
-
-- lineinfile:
-    path: /etc/passwd
-    regexp: 'polkitd:x:999:998:User for polkitd:/:/sbin/nologin'
-    line: 'polkitd:x:500:998:User for polkitd:/:/sbin/nologin'
-  when: replace_non_galaxy_999 is defined
-
-- command: "find / -uid 999 -exec chown 500 '{}' +"
-  ignore_errors: yes
-  when: replace_non_galaxy_999 is defined
-
-- name: galaxy account group
-  group:
-    gid: "{{ galaxy_gid }}"
-    name: galaxy
-    state: present
-
-- name: galaxy account user
-  user:
-    uid: "{{ galaxy_uid }}"
-    name: galaxy
-    group: galaxy
-    home: /opt/galaxy
-    state: present
-    comment: Galaxy Service-Acct
-    createhome: no
-
-- name: 'disable selinux'
-  command: setenforce Permissive
diff --git a/ansible-roles/geerlingguy.nodejs/.gitignore b/ansible-roles/geerlingguy.nodejs/.gitignore
deleted file mode 100644
index c9b2377e..00000000
--- a/ansible-roles/geerlingguy.nodejs/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.retry
-tests/test.sh
diff --git a/ansible-roles/geerlingguy.nodejs/.travis.yml b/ansible-roles/geerlingguy.nodejs/.travis.yml
deleted file mode 100644
index 08618968..00000000
--- a/ansible-roles/geerlingguy.nodejs/.travis.yml
+++ /dev/null
@@ -1,41 +0,0 @@
----
-services: docker
-
-env:
-  # Defaults.
-  - distro: centos7
-  - distro: centos6
-  - distro: ubuntu1804
-  - distro: ubuntu1604
-  - distro: debian9
-  - distro: debian8
-
-  # Latest release.
-  - distro: centos7
-    playbook: test-latest.yml
-  - distro: ubuntu1604
-    playbook: test-latest.yml
-
-script:
-  # Configure test script so we can run extra tests after playbook is run.
-  - export container_id=$(date +%s)
-  - export cleanup=false
-
-  # Download test shim.
-  - wget -O ${PWD}/tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/
-  - chmod +x ${PWD}/tests/test.sh
-
-  # Run tests.
-  - ${PWD}/tests/test.sh
-
-  # Ensure Node.js is installed.
-  - 'docker exec --tty ${container_id} env TERM=xterm which node'
-  - 'docker exec --tty ${container_id} env TERM=xterm node -v'
-
-  # Ensure npm packages are installed globally.
-  - 'docker exec --tty ${container_id} env TERM=xterm bash --login -c "npm list -g --depth=0 jslint"'
-  - 'docker exec --tty ${container_id} env TERM=xterm bash --login -c "npm list -g --depth=0 node-sass"'
-  - 'docker exec --tty ${container_id} env TERM=xterm bash --login -c "npm list -g --depth=0 yo"'
-
-notifications:
-  webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/ansible-roles/geerlingguy.nodejs/LICENSE b/ansible-roles/geerlingguy.nodejs/LICENSE
deleted file mode 100644
index 4275cf3c..00000000
--- a/ansible-roles/geerlingguy.nodejs/LICENSE
+++ /dev/null
@@ -1,20 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2017 Jeff Geerling
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/ansible-roles/geerlingguy.nodejs/README.md b/ansible-roles/geerlingguy.nodejs/README.md
deleted file mode 100644
index fa703d9e..00000000
--- a/ansible-roles/geerlingguy.nodejs/README.md
+++ /dev/null
@@ -1,73 +0,0 @@
-# Ansible Role: Node.js
-
-[![Build Status](https://travis-ci.org/geerlingguy/ansible-role-nodejs.svg?branch=master)](https://travis-ci.org/geerlingguy/ansible-role-nodejs)
-
-Installs Node.js on RHEL/CentOS or Debian/Ubuntu.
-
-## Requirements
-
-None.
-
-## Role Variables
-
-Available variables are listed below, along with default values (see `defaults/main.yml`):
-
-    nodejs_version: "6.x"
-
-The Node.js version to install. "6.x" is the default and works on most supported OSes. Other versions such as "0.12", "4.x", "5.x", "6.x", etc. should work on the latest versions of Debian/Ubuntu and RHEL/CentOS.
-
-    nodejs_install_npm_user: "{{ ansible_ssh_user }}"
-
-The user for whom the npm packages will be installed can be set here, this defaults to `ansible_user`.
-
-    npm_config_prefix: "/usr/local/lib/npm"
-
-The global installation directory. This should be writeable by the `nodejs_install_npm_user`.
-
-    npm_config_unsafe_perm: "false"
-
-Set to true to suppress the UID/GID switching when running package scripts. If set explicitly to false, then installing as a non-root user will fail.
-
-    nodejs_npm_global_packages: []
-
-A list of npm packages with a `name` and (optional) `version` to be installed globally. For example:
-
-    nodejs_npm_global_packages:
-      # Install a specific version of a package.
-      - name: jslint
-        version: 0.9.3
-      # Install the latest stable release of a package.
-      - name: node-sass
-      # This shorthand syntax also works (same as previous example).
-      - node-sass
-<!-- code block separator -->
-
-    nodejs_package_json_path: ""
-
-Set a path pointing to a particular `package.json` (e.g. `"/var/www/app/package.json"`). This will install all of the defined packages globally using Ansible's `npm` module.
-
-## Dependencies
-
-None.
-
-## Example Playbook
-
-    - hosts: utility
-      vars_files:
-        - vars/main.yml
-      roles:
-        - geerlingguy.nodejs
-
-*Inside `vars/main.yml`*:
-
-    nodejs_npm_global_packages:
-      - name: jslint
-      - name: node-sass
-
-## License
-
-MIT / BSD
-
-## Author Information
-
-This role was created in 2014 by [Jeff Geerling](https://www.jeffgeerling.com/), author of [Ansible for DevOps](https://www.ansiblefordevops.com/).
diff --git a/ansible-roles/geerlingguy.nodejs/defaults/main.yml b/ansible-roles/geerlingguy.nodejs/defaults/main.yml
deleted file mode 100644
index 47327488..00000000
--- a/ansible-roles/geerlingguy.nodejs/defaults/main.yml
+++ /dev/null
@@ -1,26 +0,0 @@
----
-# Set the version of Node.js to install ("0.12", "4.x", "5.x", "6.x", "8.x", "9.x").
-# Version numbers from Nodesource: https://github.com/nodesource/distributions
-nodejs_version: "6.x"
-
-# The user for whom the npm packages will be installed.
-# nodejs_install_npm_user: username
-
-# The directory for global installations.
-npm_config_prefix: "/usr/local/lib/npm"
-
-# Set to true to suppress the UID/GID switching when running package scripts. If set explicitly to false, then installing as a non-root user will fail.
-npm_config_unsafe_perm: "false"
-
-# Define a list of global packages to be installed with NPM.
-nodejs_npm_global_packages: []
-#  # Install a specific version of a package.
-#  - name: jslint
-#    version: 0.9.3
-#  # Install the latest stable release of a package.
-#  - name: node-sass
-#  # This shorthand syntax also works (same as previous example).
-#  - node-sass
-
-# The path of a package.json file used to install packages globally.
-nodejs_package_json_path: ""
diff --git a/ansible-roles/geerlingguy.nodejs/meta/.galaxy_install_info b/ansible-roles/geerlingguy.nodejs/meta/.galaxy_install_info
deleted file mode 100644
index 7a45294d..00000000
--- a/ansible-roles/geerlingguy.nodejs/meta/.galaxy_install_info
+++ /dev/null
@@ -1 +0,0 @@
-{install_date: 'Wed Oct 17 07:54:14 2018', version: 4.2.2}
diff --git a/ansible-roles/geerlingguy.nodejs/meta/main.yml b/ansible-roles/geerlingguy.nodejs/meta/main.yml
deleted file mode 100644
index b567a2f6..00000000
--- a/ansible-roles/geerlingguy.nodejs/meta/main.yml
+++ /dev/null
@@ -1,30 +0,0 @@
----
-dependencies: []
-
-galaxy_info:
-  author: geerlingguy
-  description: Node.js installation for Linux
-  company: "Midwestern Mac, LLC"
-  license: "license (BSD, MIT)"
-  min_ansible_version: 2.4
-  platforms:
-    - name: EL
-      versions:
-      - 6
-      - 7
-    - name: Debian
-      versions:
-      - all
-    - name: Ubuntu
-      versions:
-      - trusty
-      - xenial
-      - bionic
-  galaxy_tags:
-    - development
-    - web
-    - javascript
-    - js
-    - node
-    - npm
-    - nodejs
diff --git a/ansible-roles/geerlingguy.nodejs/tasks/main.yml b/ansible-roles/geerlingguy.nodejs/tasks/main.yml
deleted file mode 100644
index 6b125c14..00000000
--- a/ansible-roles/geerlingguy.nodejs/tasks/main.yml
+++ /dev/null
@@ -1,41 +0,0 @@
----
-- import_tasks: setup-RedHat.yml
-  when: ansible_os_family == 'RedHat'
-
-- import_tasks: setup-Debian.yml
-  when: ansible_os_family == 'Debian'
-
-- name: Define nodejs_install_npm_user
-  set_fact:
-    nodejs_install_npm_user: "{{ ansible_user | default(lookup('env', 'USER')) }}"
-  when: nodejs_install_npm_user is not defined
-
-- name: Create npm global directory
-  file:
-    path: "{{ npm_config_prefix }}"
-    owner: "{{ nodejs_install_npm_user }}"
-    group: "{{ nodejs_install_npm_user }}"
-    state: directory
-
-- name: Add npm_config_prefix bin directory to global $PATH.
-  template:
-    src: npm.sh.j2
-    dest: /etc/profile.d/npm.sh
-    mode: 0644
-
-- name: Ensure npm global packages are installed.
-  npm:
-    name: "{{ item.name | default(item) }}"
-    version: "{{ item.version | default('latest') }}"
-    global: yes
-    state: latest
-  environment:
-    NPM_CONFIG_PREFIX: "{{ npm_config_prefix }}"
-    NODE_PATH: "{{ npm_config_prefix }}/lib/node_modules"
-    NPM_CONFIG_UNSAFE_PERM: "{{ npm_config_unsafe_perm }}"
-  with_items: "{{ nodejs_npm_global_packages }}"
-
-- name: Install packages defined in a given package.json.
-  npm:
-    path: "{{ nodejs_package_json_path }}"
-  when: nodejs_package_json_path is defined and nodejs_package_json_path
diff --git a/ansible-roles/geerlingguy.nodejs/tasks/setup-Debian.yml b/ansible-roles/geerlingguy.nodejs/tasks/setup-Debian.yml
deleted file mode 100644
index c939617e..00000000
--- a/ansible-roles/geerlingguy.nodejs/tasks/setup-Debian.yml
+++ /dev/null
@@ -1,25 +0,0 @@
----
-- name: Ensure apt-transport-https is installed.
-  apt: name=apt-transport-https state=present
-
-- name: Add Nodesource apt key.
-  apt_key:
-    url: https://keyserver.ubuntu.com/pks/lookup?op=get&fingerprint=on&search=0x1655A0AB68576280
-    id: "68576280"
-    state: present
-
-- name: Add NodeSource repositories for Node.js.
-  apt_repository:
-    repo: "{{ item }}"
-    state: present
-  with_items:
-    - "deb https://deb.nodesource.com/node_{{ nodejs_version }} {{ ansible_distribution_release }} main"
-    - "deb-src https://deb.nodesource.com/node_{{ nodejs_version }} {{ ansible_distribution_release }} main"
-  register: node_repo
-
-- name: Update apt cache if repo was added.
-  apt: update_cache=yes
-  when: node_repo.changed
-
-- name: Ensure Node.js and npm are installed.
-  apt: "name=nodejs={{ nodejs_version|regex_replace('x', '') }}* state=present"
diff --git a/ansible-roles/geerlingguy.nodejs/tasks/setup-RedHat.yml b/ansible-roles/geerlingguy.nodejs/tasks/setup-RedHat.yml
deleted file mode 100644
index f2b9ee77..00000000
--- a/ansible-roles/geerlingguy.nodejs/tasks/setup-RedHat.yml
+++ /dev/null
@@ -1,37 +0,0 @@
----
-- name: Set up the Nodesource RPM directory for Node.js > 0.10.
-  set_fact:
-    nodejs_rhel_rpm_dir: "pub_{{ nodejs_version }}"
-  when: nodejs_version != '0.10'
-
-- name: Set up the Nodesource RPM variable for Node.js == 0.10.
-  set_fact:
-    nodejs_rhel_rpm_dir: "pub"
-  when: nodejs_version == '0.10'
-
-- name: Import Nodesource RPM key (CentOS < 7).
-  rpm_key:
-    key: http://rpm.nodesource.com/pub/el/NODESOURCE-GPG-SIGNING-KEY-EL
-    state: present
-  when: ansible_distribution_major_version|int < 7
-
-- name: Import Nodesource RPM key (CentOS 7+)..
-  rpm_key:
-    key: https://rpm.nodesource.com/pub/el/NODESOURCE-GPG-SIGNING-KEY-EL
-    state: present
-  when: ansible_distribution_major_version|int >= 7
-
-- name: Add Nodesource repositories for Node.js (CentOS < 7).
-  yum:
-    name: "http://rpm.nodesource.com/{{ nodejs_rhel_rpm_dir }}/el/{{ ansible_distribution_major_version }}/{{ ansible_architecture }}/nodesource-release-el{{ ansible_distribution_major_version }}-1.noarch.rpm"
-    state: present
-  when: ansible_distribution_major_version|int < 7
-
-- name: Add Nodesource repositories for Node.js (CentOS 7+).
-  yum:
-    name: "https://rpm.nodesource.com/{{ nodejs_rhel_rpm_dir }}/el/{{ ansible_distribution_major_version }}/{{ ansible_architecture }}/nodesource-release-el{{ ansible_distribution_major_version }}-1.noarch.rpm"
-    state: present
-  when: ansible_distribution_major_version|int >= 7
-
-- name: Ensure Node.js and npm are installed.
-  yum: "name=nodejs-{{ nodejs_version|regex_replace('x', '') }}* state=present enablerepo='nodesource'"
diff --git a/ansible-roles/geerlingguy.nodejs/templates/npm.sh.j2 b/ansible-roles/geerlingguy.nodejs/templates/npm.sh.j2
deleted file mode 100644
index 67caa789..00000000
--- a/ansible-roles/geerlingguy.nodejs/templates/npm.sh.j2
+++ /dev/null
@@ -1,3 +0,0 @@
-export PATH={{ npm_config_prefix }}/bin:$PATH
-export NPM_CONFIG_PREFIX={{ npm_config_prefix }}
-export NODE_PATH=$NODE_PATH:{{ npm_config_prefix }}/lib/node_modules
diff --git a/ansible-roles/geerlingguy.nodejs/tests/README.md b/ansible-roles/geerlingguy.nodejs/tests/README.md
deleted file mode 100644
index 6fb21172..00000000
--- a/ansible-roles/geerlingguy.nodejs/tests/README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# Ansible Role tests
-
-To run the test playbook(s) in this directory:
-
-  1. Install and start Docker.
-  1. Download the test shim (see .travis.yml file for the URL) into `tests/test.sh`:
-    - `wget -O tests/test.sh https://gist.githubusercontent.com/geerlingguy/73ef1e5ee45d8694570f334be385e181/raw/`
-  1. Make the test shim executable: `chmod +x tests/test.sh`.
-  1. Run (from the role root directory) `distro=[distro] playbook=[playbook] ./tests/test.sh`
-
-If you don't want the container to be automatically deleted after the test playbook is run, add the following environment variables: `cleanup=false container_id=$(date +%s)`
diff --git a/ansible-roles/geerlingguy.nodejs/tests/test-latest.yml b/ansible-roles/geerlingguy.nodejs/tests/test-latest.yml
deleted file mode 100644
index 8aee4138..00000000
--- a/ansible-roles/geerlingguy.nodejs/tests/test-latest.yml
+++ /dev/null
@@ -1,21 +0,0 @@
----
-- hosts: all
-
-  vars:
-    nodejs_version: "9.x"
-    nodejs_install_npm_user: root
-    npm_config_prefix: /root/.npm-global
-    npm_config_unsafe_perm: "true"
-    nodejs_npm_global_packages:
-      - node-sass
-      - name: jslint
-        version: 0.12.0
-      - name: yo
-
-  pre_tasks:
-    - name: Update apt cache.
-      apt: update_cache=yes cache_valid_time=600
-      when: ansible_os_family == 'Debian'
-
-  roles:
-    - role_under_test
diff --git a/ansible-roles/geerlingguy.nodejs/tests/test.yml b/ansible-roles/geerlingguy.nodejs/tests/test.yml
deleted file mode 100644
index 72832e0d..00000000
--- a/ansible-roles/geerlingguy.nodejs/tests/test.yml
+++ /dev/null
@@ -1,20 +0,0 @@
----
-- hosts: all
-
-  vars:
-    nodejs_install_npm_user: root
-    npm_config_prefix: /root/.npm-global
-    npm_config_unsafe_perm: "true"
-    nodejs_npm_global_packages:
-      - node-sass
-      - name: jslint
-        version: 0.9.6
-      - name: yo
-
-  pre_tasks:
-    - name: Update apt cache.
-      apt: update_cache=yes cache_valid_time=600
-      when: ansible_os_family == 'Debian'
-
-  roles:
-    - role_under_test
diff --git a/ansible-roles/group_vars/condor.yml b/ansible-roles/group_vars/condor.yml
deleted file mode 100644
index 6e049257..00000000
--- a/ansible-roles/group_vars/condor.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-condor_copy_template: false
diff --git a/ansible-roles/group_vars/gpu.yml b/ansible-roles/group_vars/gpu.yml
deleted file mode 100644
index db3e91d7..00000000
--- a/ansible-roles/group_vars/gpu.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-# Cuda
-install_cuda: false
-
-# Nvidia container
-install_nvidia_container: false
\ No newline at end of file
diff --git a/ansible-roles/group_vars/grub.yml b/ansible-roles/group_vars/grub.yml
deleted file mode 100644
index 8158beca..00000000
--- a/ansible-roles/group_vars/grub.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-# grub
-boot_options: "console=ttyS0 spectre_v2=off nopti"
diff --git a/ansible-roles/internal.yml b/ansible-roles/internal.yml
deleted file mode 100644
index 83c32509..00000000
--- a/ansible-roles/internal.yml
+++ /dev/null
@@ -1,26 +0,0 @@
----
-- hosts: default
-  vars:
-    internal: true
-  vars_files:
-    - "group_vars/all.yml"
-  pre_tasks:
-    - name: Copy server key into VM temporarily
-      copy:
-        src: server_ca
-        dest: /tmp/server_ca
-        owner: root
-        group: root
-        mode: 0600
-    - name: Add HostCertificate options
-      lineinfile:
-        path: /etc/ssh/sshd_config
-        regexp: "^HostKey /etc/ssh/ssh_host_{{ item }}_key"
-        line: "HostKey /etc/ssh/ssh_host_{{ item }}_key\nHostCertificate /etc/ssh/ssh_host_{{ item }}_key-cert.pub"
-      with_items:
-        - rsa
-        - ecdsa
-        - ed25519
-  roles:
-    - lock-root
-    - cloudinit
diff --git a/ansible-roles/jenkins/files/jenkins-v1.pub b/ansible-roles/jenkins/files/jenkins-v1.pub
deleted file mode 100644
index 85cb44ed..00000000
--- a/ansible-roles/jenkins/files/jenkins-v1.pub
+++ /dev/null
@@ -1 +0,0 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCijQFI17q5aExREX95V3r66c2OAp3MdWrLplDVy6Pfvfy8gINHLobtpO/tBxEtxvm/L6cTtiBKCHpwWkVLp+1Z6gpJumtITJXRkFbPUsFiOVbdgprwCbxD9J40RUxrD1Zz+hqbBiDuSttfc82Zzzh2vvYazHpzLgPHEeh+9a6IdbFbRIvf1FgdUoR1hUMmcHdAdvwrsLXaN0ZYa/XlAp+JPFAqZjL8HCiko3kMOq329thZJBEPBUdYE6IVrIke4uff1ONObnmaJYtburd8Z0bwaYNYbIce5yYH/V/oNAFUgL+mp55U+IJD4ju0gRbzR/ibc/E2yrdLXHGIY2z7hDZv jenkins@jenkins.denbi.uni-freiburg.de
diff --git a/ansible-roles/jenkins/files/jenkins-v2.pub b/ansible-roles/jenkins/files/jenkins-v2.pub
deleted file mode 100644
index 44e124c7..00000000
--- a/ansible-roles/jenkins/files/jenkins-v2.pub
+++ /dev/null
@@ -1 +0,0 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDV7gfNbNN5O8vH6/tM/iOFXKBP2YKRHXOmdfV8ogvu9BdVV0IPmDzk2EooVpThDE1VMv1hz3811tvBhHRJ6IgNhVIV/61w/+RazQD/AU27X8bX+Hb9EQ/bP4DW+6ySd/z5vdDLzpH5dbiMhzPEDkXVsylUT+hkQnas6cHspDhHmtKQ5MWOgDe3D/IEudTDJQe8hxxaU4TaZUmFzn7eYp9HvuK8qW0yCy4NWOxJJHA+G5wSCyLuKnaKo4AitUIzSKF1AB94oq7b96KONhPxgRptAk4OYIUTdNFbrI5HDaSNzHLnF5FbjQvG+Eu6m5nY5yvJMogE+jiuWeIXCZTCFljg287FUo0ohmbZpd802L6VXun14VumRC+rRgPrvBALo/CsyCsPIoBSTKhVElxKVOcRjmTLNfrUZM0GQxqJhIvah8BV+JTExkipPwkrKTdMAWIXvCoehxV+WMpBWqtEEzAzEoqJpaiec7HfriwsHTGESZWAPYEbFjzbHXQZtqBkbOvtokPMRmTWfWKxaplCMN6ddJeeY6faorD0w/e6lszWES1Q1ieajiPKDy37UvybKKvPTk4o3MzyzYOS4c8HQj+jnGeR5Q3ETuyz4psLyOfuBtIrfOeuxV42rFDmkYM3IrrRR+F9oklFG6Ig8DVfgQEzSG36NkgvpF4OdFvigYqXvw== jenkins@jenkins.denbi.uni-freiburg.de
diff --git a/ansible-roles/jenkins/tasks/main.yml b/ansible-roles/jenkins/tasks/main.yml
deleted file mode 100644
index 6bdd9aa7..00000000
--- a/ansible-roles/jenkins/tasks/main.yml
+++ /dev/null
@@ -1,45 +0,0 @@
----
-- name: Install packages
-  yum:
-    name: "{{ item }}"
-    state: present
-  with_items:
-    - qemu-kvm
-    - qemu-img
-    - unzip
-    - seabios
-    - rubygems # should install ruby et al
-    - ruby 
-
-- name: Download packer
-  shell: wget https://releases.hashicorp.com/packer/1.7.10/packer_1.7.10_linux_amd64.zip -O /tmp/packer.zip
-
-- name: Extract packer
-  shell: unzip /tmp/packer.zip -d /usr/bin
-
-#- name: Install rvm keys
-#  shell: gpg2 --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
-#
-#- name: Install rvm
-#  shell: curl -sSL https://get.rvm.io | bash -s stable
-
-- name: Adding existing user centos to group kvm
-  user:
-    name: centos
-    groups: kvm
-    append: yes
-
-#- name: Adding existing user centos to group rvm
-#  user:
-#    name: centos
-#    groups: rvm
-#    append: yes
-#
-#- name: Install recent ruby
-#  shell: rvm install 2.6
-
-#- name: Download google chrome rpm
-#  shell: wget https://dl.google.com/linux/direct/google-chrome-stable_current_x86_64.rpm
-#
-#- name: Install it
-#  shell: yum install -y google-chrome-stable_current_x86_64.rpm
diff --git a/ansible-roles/run-playbook-only-internal.json b/ansible-roles/run-playbook-only-internal.json
deleted file mode 100644
index 7c04a051..00000000
--- a/ansible-roles/run-playbook-only-internal.json
+++ /dev/null
@@ -1,32 +0,0 @@
-
-{
-	"variables": {
-		"ssh_password": "password"
-	},
-	"builders": [{
-		"type": "qemu",
-		"iso_url": "{{ user `image_dir` }}/{{ user `image_name` }}",
-		"iso_checksum_type": "none",
-		"output_directory": "output-{{ user `image_dir` }}",
-		"vm_name": "{{ user `vm_name` }}",
-		"disk_image": "true",
-		"format": "qcow2",
-		"disk_size": "{{ user `disk_size` }}",
-		"headless": "{{ user `headless` }}",
-		"ssh_timeout": "{{ user `ssh_timeout` }}",
-		"ssh_username": "{{ user `ssh_username` }}",
-		"ssh_password": "{{ user `ssh_password` }}",
-		"shutdown_command": "shutdown -P now",
-		"qemuargs": [
-			["-m", "{{ user `memory` }}"],
-			["-smp", "{{ user `cpus` }}"]
-		]
-	}],
-	"provisioners": [{
-		"type": "ansible",
-		"playbook_file": "{{ template_dir }}/{{ user `playbook` }}",
-		"extra_arguments": [
-			"--vault-password-file=.vault_pass"
-		]
-	}]
-}
diff --git a/ansible-roles/run-playbook-only.json b/ansible-roles/run-playbook-only.json
deleted file mode 100644
index 5de328ad..00000000
--- a/ansible-roles/run-playbook-only.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-	"variables": {
-		"ssh_password": "password"
-	},
-	"builders": [{
-		"type": "qemu",
-		"iso_url": "{{ user `image_dir` }}/{{ user `image_name` }}",
-		"iso_checksum_type": "none",
-		"output_directory": "output-{{ user `image_dir` }}",
-		"vm_name": "{{ user `vm_name` }}",
-		"disk_image": "true",
-		"format": "qcow2",
-		"disk_size": "{{ user `disk_size` }}",
-		"headless": "{{ user `headless` }}",
-		"ssh_timeout": "{{ user `ssh_timeout` }}",
-		"ssh_username": "{{ user `ssh_username` }}",
-		"ssh_password": "{{ user `ssh_password` }}",
-		"shutdown_command": "shutdown -P now",
-		"qemuargs": [
-			["-m", "{{ user `memory` }}"],
-			["-smp", "{{ user `cpus` }}"]
-		]
-	}],
-	"provisioners": [{
-		"type": "ansible",
-		"playbook_file": "{{ template_dir }}/{{ user `playbook` }}"
-	}]
-}
diff --git a/ansible-roles/setup-generic.yml b/ansible-roles/setup-generic.yml
deleted file mode 100644
index 8583acbc..00000000
--- a/ansible-roles/setup-generic.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-# Setup for generic node
-# This setup is valid for RHEL 7.x based systems.
----
-- hosts: default
-
-  vars:
-    software_groups_to_install:
-      - admin
-      - editors
-      - terminals
-      - utils
-
-  vars_files:
-    - "group_vars/all.yml"
-
-  pre_tasks:
-    - name: system update
-      ansible.builtin.dnf:
-        name: '*'
-        state: latest
-    - name: Put SELinux in permissive mode, logging actions that would be blocked.
-      ansible.posix.selinux:
-        policy: targeted
-        state: permissive
-    - name: Disable firewalld service
-      ansible.builtin.systemd:
-        name: firewalld
-        enabled: no
-        state: stopped
-
-  roles:
-    - role: usegalaxy_eu.handy.os_setup
-      vars:
-        enable_powertools: true
-        enable_install_software: true
-        enable_grub: true
-        enable_kernel_5: true
-
-    - geerlingguy.repo-epel # Install EPEL
-    - usegalaxy-eu.autoupdates  # keep all of our packages up to date
-    - usegalaxy-eu.dynmotd
-    - dj-wasabi.telegraf
-    - influxdata.chrony
diff --git a/ansible-roles/setup-jenkins.yml b/ansible-roles/setup-jenkins.yml
deleted file mode 100644
index 0a7a8183..00000000
--- a/ansible-roles/setup-jenkins.yml
+++ /dev/null
@@ -1,90 +0,0 @@
-# Setup for Virtual Jenkins Compute Node
-# This setup is valid for RHEL 8.x based systems.
----
-- hosts: default
-
-  vars:
-    jenkins_public_ssh_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDfQrCU7MkCPHoFt6kwBnh3kZMd38WMbP4TSmaYrRjqwNAqlW9zoyHMy/eU+Gvb87hjSm9EZG8GOoHAkkqy1s7G6qQWNfYoxyQmbxs/nj3mtvFRKfow8WUmt2Xew5tXWJX1GxWtpyNn4ytrB7iGJRyiGN1R/g6qyBu/rxWtVvWxz79THajJqt5zgJFvnnLDOj9wlUIdA6lXlMOE0fUzdXsBNhZGWMwMCo+hd3i+SHsuK5QvBGPz/c9SdfzyKfg8JFmb2dfMCfybhsAeGO315qZWe1t7fgwVYiFRcOvTpZ0SR7sFPfmEAzm4sIF10n1EIADB70tfmsWsPX42oC/l4Zp1"
-    software_groups_to_install:
-      - admin
-      - editors
-      - terminals
-      - utils
-
-  vars_files:
-    - "group_vars/all.yml"
-    - "group_vars/java.yml"
-
-  pre_tasks:
-    - name: system update
-      ansible.builtin.dnf:
-        name: '*'
-        state: latest
-    - name: Install some dependencies
-      become: yes
-      ansible.builtin.dnf:
-        state: latest
-        name:
-          - git
-          - python38
-          - python3-devel
-          - python3-virtualenv
-          - gcc
-          - curl
-          - libcurl-devel
-          - openssl-devel
-          - qemu-kvm
-          - qemu-img
-          - unzip
-          - seabios
-    - name: Set default version of Python
-      ansible.builtin.alternatives:
-        name: python
-        path: /usr/bin/python3.8
-    - name: Ensure SELinux is set to enforcing mode
-      ansible.builtin.lineinfile:
-        path: /etc/selinux/config
-        regexp: '^SELINUX='
-        line: SELINUX=enforcing
-
-  post_tasks:
-    - name: Set default version of Python
-      ansible.builtin.alternatives:
-        name: java
-        link: /usr/bin/java
-        path: /usr/lib/jvm/java-11-openjdk/bin/java
-
-    - name: Download packer
-      ansible.builtin.shell: wget https://releases.hashicorp.com/packer/1.7.10/packer_1.7.10_linux_amd64.zip -O /tmp/packer.zip
-
-    - name: Extract packer
-      ansible.builtin.shell: unzip /tmp/packer.zip -d /usr/bin
-
-    - name: Adding existing user centos to group kvm
-      ansible.builtin.user:
-        name: centos
-        groups: kvm
-        append: yes
-
-    - name: Set authorized key taken from var
-      ansible.posix.authorized_key:
-        user: centos
-        state: present
-        key: "{{ jenkins_public_ssh_key }}"
-
-  roles:
-    - role: usegalaxy_eu.handy.os_setup
-      vars:
-        enable_powertools: true
-        enable_install_software: true
-        enable_grub: true
-        enable_kernel_5: true
-
-    - geerlingguy.repo-epel # Install EPEL
-    - usegalaxy-eu.autoupdates  # keep all of our packages up to date
-    - usegalaxy-eu.dynmotd
-    - geerlingguy.java
-    - geerlingguy.docker
-    - dj-wasabi.telegraf
-    - influxdata.chrony
-
diff --git a/ansible-roles/setup-vgcn-bwcloud-gpu.yml b/ansible-roles/setup-vgcn-bwcloud-gpu.yml
deleted file mode 100644
index 0566c85b..00000000
--- a/ansible-roles/setup-vgcn-bwcloud-gpu.yml
+++ /dev/null
@@ -1,138 +0,0 @@
-# Setup for Virtual Galaxy Compute Node
-# This setup is valid for RHEL 8.x based systems.
----
-- hosts: default
-  vars_files:
-    - "group_vars/all.yml"
-    - "group_vars/pulsar.yml"
-    - "group_vars/condor.yml"
-    - "group_vars/gpu.yml"
-  pre_tasks:
-    - name: system update
-      ansible.builtin.dnf:
-        name: '*'
-        state: latest
-        exclude: condor*
-    - name: Install Pulsar dependencies
-      become: yes
-      ansible.builtin.dnf:
-        state: latest
-        name:
-          - git
-          - python36
-          - python3-devel
-          - python3-virtualenv
-          - python38
-          - python38-devel
-          - gcc
-          - curl
-          - libcurl-devel
-          - openssl-devel
-    - name: Set default version of Python
-      ansible.builtin.alternatives:
-        name: python
-        path: /usr/bin/python3
-    - name: Put SELinux in permissive mode, logging actions that would be blocked.
-      ansible.builtin.lineinfile:
-        path: /etc/selinux/config
-        regexp: '^SELINUX='
-        line: SELINUX=permissive
-    - name: "Deploy docker-stop-1M script"
-      ansible.builtin.copy:
-        content: |
-            #!/bin/bash
-            docker ps -f status=running --format '{{ '{{' }}.ID}}: {{ '{{' }}.RunningFor}}' | awk '/months/ && $2 > 1 { print $0 }'|cut -f1 -d':' | xargs docker stop
-        dest: /usr/bin/docker-stop-1M
-        owner: root
-        group: root
-        mode: 0755
-  post_tasks:
-    - name: galaxy account group
-      ansible.builtin.group:
-        gid: "{{ galaxy_gid }}"
-        name: galaxy
-        state: present
-    - name: galaxy account user
-      ansible.builtin.user:
-        uid: "{{ galaxy_uid }}"
-        name: galaxy
-        group: galaxy
-        home: /opt/galaxy
-        state: present
-        comment: Galaxy Service-Acct
-        createhome: no
-    - ansible.builtin.user:
-        name: galaxy
-        groups: condor,docker
-        append: yes
-    - ansible.builtin.dnf:
-        name: "{{ packages }}"
-        state: absent
-      vars:
-        packages:
-          - gcc
-          - libcurl-devel
-          - openssl-devel
-      become: yes
-    - name: Copy Docker daemon.json
-      ansible.builtin.copy:
-        src: daemon.json
-        dest: /etc/docker/daemon.json
-        mode: '0644'
-    - name: Restart Docker service, in all cases
-      ansible.builtin.service:
-        name: docker
-        state: restarted
-    - name: Disable firewalld service
-      ansible.builtin.systemd:
-        name: firewalld
-        enabled: no
-        state: stopped
-    - name: Deploy a signal emitter for telegraf
-      ansible.builtin.copy:
-        content: |
-          #!/bin/bash
-          echo '{"alive":1}'
-        dest: /bin/iamalive
-        owner: telegraf
-        group: telegraf
-        mode: 0755
-  roles:
-    - geerlingguy.repo-epel # Install EPEL
-    - role: usegalaxy_eu.handy.os_setup
-      vars:
-        enable_powertools: true # geerlingguy.repo-epel role doesn't enable PowerTools repository
-        enable_remap_user: false
-        enable_pam_limits: true
-        enable_grub: true
-        enable_cgroups: true
-        enable_journald: true
-        enable_install_software: true
-        enable_ansible_root_cron: false
-
-    - usegalaxy-eu.autofs
-    - usegalaxy-eu.dynmotd
-
-    - geerlingguy.java
-    - geerlingguy.docker
-
-    - usegalaxy_eu.htcondor
-
-    - dj-wasabi.telegraf
-    - influxdata.chrony
-
-    - galaxyproject.cvmfs
-    - galaxyproject.pulsar
-    - usegalaxy_eu.cuda
-    - usegalaxy_eu.nvidia_container
-
-    - role: usegalaxy_eu.handy.os_setup
-      vars:
-        enable_powertools: false # geerlingguy.repo-epel role doesn't enable PowerTools repository
-        enable_remap_user: true  # needs to be at the end, otherwise dnsmasq will occupy 999 slot
-        enable_pam_limits: false
-        enable_grub: false
-        enable_cgroups: false
-        enable_journald: false
-        enable_install_software: false
-        enable_ansible_root_cron: true
diff --git a/ansible-roles/setup-vgcn-bwcloud-secure.yml b/ansible-roles/setup-vgcn-bwcloud-secure.yml
deleted file mode 100644
index c378c64d..00000000
--- a/ansible-roles/setup-vgcn-bwcloud-secure.yml
+++ /dev/null
@@ -1,138 +0,0 @@
-# Setup for Virtual Galaxy Compute Node
-# This setup is valid for RHEL 8.x based systems.
-# It has SELinux enabled and Meltdown, Spectre patches on
----
-- hosts: default
-  vars_files:
-    - "group_vars/all.yml"
-    - "group_vars/pulsar.yml"
-    - "group_vars/condor.yml"
-  pre_tasks:
-    - name: system update
-      ansible.builtin.dnf:
-        name: '*'
-        state: latest
-        exclude: condor*
-    - name: Install Pulsar dependencies
-      become: yes
-      ansible.builtin.dnf:
-        state: latest
-        name:
-          - git
-          - python36
-          - python3-devel
-          - python3-virtualenv
-          - python38
-          - python38-devel
-          - gcc
-          - curl
-          - libcurl-devel
-          - openssl-devel
-    - name: Set default version of Python
-      ansible.builtin.alternatives:
-        name: python
-        path: /usr/bin/python3
-    - name: Put SELinux in permissive mode, logging actions that would be blocked.
-      ansible.builtin.lineinfile:
-        path: /etc/selinux/config
-        regexp: '^SELINUX='
-        line: SELINUX=permissive
-    - name: "Deploy docker-stop-1M script"
-      ansible.builtin.copy:
-        content: |
-            #!/bin/bash
-            docker ps -f status=running --format '{{ '{{' }}.ID}}: {{ '{{' }}.RunningFor}}' | awk '/months/ && $2 > 1 { print $0 }'|cut -f1 -d':' | xargs docker stop
-        dest: /usr/bin/docker-stop-1M
-        owner: root
-        group: root
-        mode: 0755
-  post_tasks:
-    - name: galaxy account group
-      ansible.builtin.group:
-        gid: "{{ galaxy_gid }}"
-        name: galaxy
-        state: present
-    - name: galaxy account user
-      ansible.builtin.user:
-        uid: "{{ galaxy_uid }}"
-        name: galaxy
-        group: galaxy
-        home: /opt/galaxy
-        state: present
-        comment: Galaxy Service-Acct
-        createhome: no
-    - ansible.builtin.user:
-        name: galaxy
-        groups: condor,docker
-        append: yes
-    - ansible.builtin.dnf:
-        name: "{{ packages }}"
-        state: absent
-      vars:
-        packages:
-          - gcc
-          - libcurl-devel
-          - openssl-devel
-      become: yes
-    - name: Copy Docker daemon.json
-      ansible.builtin.copy:
-        src: daemon.json
-        dest: /etc/docker/daemon.json
-        mode: '0644'
-    - name: Restart Docker service, in all cases
-      ansible.builtin.service:
-        name: docker
-        state: restarted
-    - name: Disable firewalld service
-      ansible.builtin.systemd:
-        name: firewalld
-        enabled: no
-        state: stopped
-    - name: Deploy a signal emitter for telegraf
-      ansible.builtin.copy:
-        content: |
-          #!/bin/bash
-          echo '{"alive":1}'
-        dest: /bin/iamalive
-        owner: telegraf
-        group: telegraf
-        mode: 0755
-  roles:
-    - geerlingguy.repo-epel # Install EPEL
-    - role: usegalaxy_eu.handy.os_setup
-      vars:
-        enable_powertools: true # geerlingguy.repo-epel role doesn't enable PowerTools repository
-        enable_remap_user: false
-        enable_kernel_5: true
-        enable_pam_limits: true
-        enable_grub: true
-        enable_cgroups: true
-        enable_journald: true
-        enable_install_software: true
-        enable_ansible_root_cron: false
-
-    - usegalaxy-eu.autofs
-    - usegalaxy-eu.dynmotd
-
-    - geerlingguy.java
-    - geerlingguy.docker
-
-    - usegalaxy_eu.htcondor
-
-    - dj-wasabi.telegraf
-    - influxdata.chrony
-
-    - galaxyproject.cvmfs
-    - galaxyproject.pulsar
-
-    - role: usegalaxy_eu.handy.os_setup
-      vars:
-        enable_powertools: false # geerlingguy.repo-epel role doesn't enable PowerTools repository
-        enable_remap_user: true  # needs to be at the end, otherwise dnsmasq will occupy 999 slot
-        enable_kernel_5: false
-        enable_pam_limits: false
-        enable_grub: false
-        enable_cgroups: false
-        enable_journald: false
-        enable_install_software: false
-        enable_ansible_root_cron: true
diff --git a/ansible-roles/setup-vgcn-bwcloud.yml b/ansible-roles/setup-vgcn-bwcloud.yml
deleted file mode 100644
index 3d676aad..00000000
--- a/ansible-roles/setup-vgcn-bwcloud.yml
+++ /dev/null
@@ -1,139 +0,0 @@
-# Setup for Virtual Galaxy Compute Node
-# This setup is valid for RHEL 8.x based systems.
-# It has SELinux disabled and Meltdown, Spectre patches off
----
-- hosts: default
-  vars_files:
-    - "group_vars/all.yml"
-    - "group_vars/grub.yml"
-    - "group_vars/pulsar.yml"
-    - "group_vars/condor.yml"
-  pre_tasks:
-    - name: system update
-      ansible.builtin.dnf:
-        name: '*'
-        state: latest
-        exclude: condor*
-    - name: Install Pulsar dependencies
-      become: yes
-      ansible.builtin.dnf:
-        state: latest
-        name:
-          - git
-          - python36
-          - python3-devel
-          - python3-virtualenv
-          - python38
-          - python38-devel
-          - gcc
-          - curl
-          - libcurl-devel
-          - openssl-devel
-    - name: Set default version of Python
-      ansible.builtin.alternatives:
-        name: python
-        path: /usr/bin/python3
-    - name: Disable SELinux.
-      ansible.builtin.lineinfile:
-        path: /etc/selinux/config
-        regexp: '^SELINUX='
-        line: SELINUX=disabled
-    - name: "Deploy docker-stop-1M script"
-      ansible.builtin.copy:
-        content: |
-            #!/bin/bash
-            docker ps -f status=running --format '{{ '{{' }}.ID}}: {{ '{{' }}.RunningFor}}' | awk '/months/ && $2 > 1 { print $0 }'|cut -f1 -d':' | xargs docker stop
-        dest: /usr/bin/docker-stop-1M
-        owner: root
-        group: root
-        mode: 0755
-  post_tasks:
-    - name: galaxy account group
-      ansible.builtin.group:
-        gid: "{{ galaxy_gid }}"
-        name: galaxy
-        state: present
-    - name: galaxy account user
-      ansible.builtin.user:
-        uid: "{{ galaxy_uid }}"
-        name: galaxy
-        group: galaxy
-        home: /opt/galaxy
-        state: present
-        comment: Galaxy Service-Acct
-        createhome: no
-    - ansible.builtin.user:
-        name: galaxy
-        groups: condor,docker
-        append: yes
-    - ansible.builtin.dnf:
-        name: "{{ packages }}"
-        state: absent
-      vars:
-        packages:
-          - gcc
-          - libcurl-devel
-          - openssl-devel
-      become: yes
-    - name: Copy Docker daemon.json
-      ansible.builtin.copy:
-        src: daemon.json
-        dest: /etc/docker/daemon.json
-        mode: '0644'
-    - name: Restart Docker service, in all cases
-      ansible.builtin.service:
-        name: docker
-        state: restarted
-    - name: Disable firewalld service
-      ansible.builtin.systemd:
-        name: firewalld
-        enabled: no
-        state: stopped
-    - name: Deploy a signal emitter for telegraf
-      ansible.builtin.copy:
-        content: |
-          #!/bin/bash
-          echo '{"alive":1}'
-        dest: /bin/iamalive
-        owner: telegraf
-        group: telegraf
-        mode: 0755
-  roles:
-    - geerlingguy.repo-epel # Install EPEL
-    - role: usegalaxy_eu.handy.os_setup
-      vars:
-        enable_powertools: true # geerlingguy.repo-epel role doesn't enable PowerTools repository
-        enable_remap_user: false
-        enable_kernel_5: true
-        enable_pam_limits: true
-        enable_grub: true
-        enable_cgroups: true
-        enable_journald: true
-        enable_install_software: true
-        enable_ansible_root_cron: false
-
-    - usegalaxy-eu.autofs
-    - usegalaxy-eu.dynmotd
-
-    - geerlingguy.java
-    - geerlingguy.docker
-
-    - usegalaxy_eu.htcondor
-
-    - dj-wasabi.telegraf
-    - influxdata.chrony
-
-    - galaxyproject.cvmfs
-    - galaxyproject.pulsar
-
-    - role: usegalaxy_eu.handy.os_setup
-      vars:
-        enable_powertools: false # geerlingguy.repo-epel role doesn't enable PowerTools repository
-        enable_remap_user: true  # needs to be at the end, otherwise dnsmasq will occupy 999 slot
-        enable_kernel_5: false
-        enable_pam_limits: false
-        enable_grub: false
-        enable_cgroups: false
-        enable_journald: false
-        enable_install_software: false
-        enable_ansible_root_cron: true
diff --git a/ansible-roles/ssh-host-sign/files/server_ca b/ansible-roles/ssh-host-sign/files/server_ca
deleted file mode 100644
index 86dbb072..00000000
--- a/ansible-roles/ssh-host-sign/files/server_ca
+++ /dev/null
@@ -1,89 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-39306461356465646232356434303833396363393338303630616366386631333863333830373936
-3330323562373062323062656638316235656465623239650a393962653263663335373436353830
-65656135353831383432303563353864306232396535626563643866393434643464386637343930
-6365666230326635370a393362336666313839343665663062393537643966666261643362366639
-35303566343336663935306331643739353035626237323532633738663037396566326264643934
-34396133633166306135613463636637356637373730346164353834613062353631323162353437
-33663930343330663930306130633730653730333634366238343333663066376635363662623065
-30376637653462666531373561643530663439303135373663643531383263383837313265383135
-39363366373031356366613639643637343161303637653832633164613132626162303633633335
-30363964343935303561326332386161616466323062393865343166363034373463656161386665
-61333035633431623366376136666534343261323261326430613838313734366166613461323032
-66303430303337633065643433626131306137636165376534356363656535376332326536653839
-36383766303637393662393034343965613936643633326132333162383738306135646565343531
-66353435336538633134613162373561636365626533303665663430343261306335373831656339
-66376162616662383364353431663061383839363564333934313331616239616662346362326566
-35616466663433353532623036323732613666346439386339626462353962356663643539636232
-38616530353236373636353639326534306436616636663838613764626265383365303464333834
-35343961366437656363653537663739653064663462343537613361386235326638633061653037
-30316564373061366162633030323538343765316636366532663162333631306662323266656332
-33393233636632346434343935393539383565353432323862623366306264626336396332613738
-64323435333565643963626435636462656536666534613665336132353130393637656334303635
-33646266333265363832633866333765373638666437373163326433643666336630653864343162
-39356163646233356133363638613462346632306465613430623638376532383464303564386264
-62366239366339333438646533323335323566316135393861636531343035663063663338343032
-62623364383435366365313661316336323038393162616166663135333038656333323366363236
-37636461316261656465613161373335333163613561643965356262636464373532363532653638
-31393131303938656337383463323165303635373637646138656562386636646131626236356437
-31393966383961333733663438646535633933626336393363343635633639316266653238353430
-36316337656661316461636664356661396462633938346232313037323664343564393134383736
-63326336353034323363373465646433333562373135613163323431383531376134626166376366
-35656430343366306166376264366339326535326136333138326561343731623438653264356332
-39653262373033623935663030633336666336306636313534393331376437643064383433333132
-65323233623665303262363064306635346265306133323864626266363039333236353636323635
-39326363633434386439623566666562633136633438346237356533376262643535613734366332
-30336430393936316634333565663430333765626262636262336665613239316565646566306334
-61313362623032366337333865653837373136386532326534356434316533643961643737393838
-31646338323036363337313933323639336535633930643934623439323439653731356337373337
-30373538313735313735663835343335313333326361643133626134623339656165663263366230
-33656434346634316233616162613230323261366631343634666336323964623762346139653337
-35616439366434353732376431633431663339313063623266363561303533646465353964663664
-62393130333939393938313065383739636535663934333161356564386565366533663639363464
-33303064313434653063366633306430303531336665333162393561336638316231343966393063
-32353536646635336431656434643435636339333765613663356139336433633031303631613266
-33633037363566343464663634353539663532646464343930626465363833333135613139306432
-38303164626662636431363635633039323561396266306339623161393266316263386666303366
-37663031373863333661373636636630626265623038636432343163346136616539613165363364
-66356339346630393535656362393631323636613963653531303237306438373732616463356163
-63313033306634333737373630616534663635383038353236353735373665336262643830616262
-66613164396134656663306666623761393265653163656332343539353364626664383334656166
-39393132363534623236383130613861623761373732353738366433366238323963306134393133
-36343238633332653134363339313330336531613137613466663465626163346564363631613830
-30383135333936623735353133666131633065643065663965386130323735383430636233333461
-39366434313238663865613739376366666337656363323366313261646537373335653565363531
-30383837386264383338376364356434653261333231303138373837613431326439653335646566
-66383130623163303366653833313664373630326166373562613933336265356530653461373764
-33623031363539653431353731343637646662633736616232636535313665616235373839353361
-63396631373032303730396639666363653164633038636438376366316363316532613335336636
-62653764636235346539653364663234613230616564353266383766663739383739333963623535
-36653566303339356662643333366131396334353137623533633463383466306635346139366366
-33613534313830663837656330376531353261653735643134643735353130333330646138306535
-39613762346561383038356562623135626637646238303038613237303838373831303762326131
-32656630373163663361356139656231346261623532313630633734633262613635376538613230
-36306439613236343935623138626463396336623264663838623763633435656464323837326266
-36316363636431666134333361366634346433623265323761643638663263626632333238303836
-33383831356631643664353635613330366336353638643436623932333938356165613461333237
-61383135313538643934633663363338666236373736333966336632633461393562383539383766
-39353233626439663538363465373439616162393161393832636639323465666131336635653361
-30623738373435616665393834363332306537633137613631306130323633623062643932633636
-33333736323735313230663030343966373930306362323838636239386535343636366264356563
-65316138396665613932303731636630653232633866623433623830656235323365383339326337
-66616431316566376562376236663562616436303465366361373639306366643934313564623437
-62366337363863646664323832373832646639366165336466646238393932306665613931633263
-34653834663034386538373538373363366538363038616666306361666236653564633130373461
-62653539373761653730353336336262636636623162366365323565623766393864636463636264
-61303932383038313232376166356264663563333134666237616433323239633262663366643636
-38383238326636383963366263643830316337366133633137316463373164633236616132336561
-32346631393339363433643131653938626166313962303130356537373366343362386130333564
-34643763393935323235376362326632343265666235373262666563373230616630383362613035
-65646664643933366230313262373961353630383836383236386639616639616462386634646362
-61316434366165613934663137393633383132636435623439373736656536633364633837376166
-32306539636465626631626236383765643961333937393431653237333739386638663738343037
-31383136633832326434623063663637663937383361656537343933346634616231366337646465
-30633865316264373437356161313537663831343466636462376161383039633437643633343730
-32656661626234626630616638356338383562303566366266306131363761313966386364323131
-32636132613861376634333861373038323839616136356435643338343463346463663536376333
-39613139643930616333336438366566356333313933336165363339643131386663633565356530
-34643435316436303163366339353363656236613965386537666638616635613637623133363935
-36383663663536623438
diff --git a/ansible-roles/ssh-host-sign/files/server_ca.pub b/ansible-roles/ssh-host-sign/files/server_ca.pub
deleted file mode 100644
index fb30aa98..00000000
--- a/ansible-roles/ssh-host-sign/files/server_ca.pub
+++ /dev/null
@@ -1 +0,0 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDLQD6fG38uwFj91GSe6YnRnBuTjXWZN6Pck1JRCTWtufwKV0SZNczD+qUdnFfZrCx/wBVK8R6zL2VWS9hcFK1LuE8HK86f8qG/gcB6yFt/0I/PWoSjcbUMPQTzFIy8yxvdIoPTlj/P6+uNgweTvMFI4+UOuCI71IhB/liTHn1/2dXQM94SFd4VQeg+3Tc6gDxEqRSS6dLIq0uvR8//luIpoW38yh2ozwHmjMKTvHnbduGqHlES4qz9cU9iZkWoPzSp+qoxCOijHvwzL5vD0/k4hZ/iJyTzDHQLDra3Kaa8ykWdERCxjpMp1y9dVQ23lVxp+UUAt3RHOCU1/KuNM9Pr hxr@mk
diff --git a/ansible-roles/ssh-host-sign/tasks/main.yml b/ansible-roles/ssh-host-sign/tasks/main.yml
deleted file mode 100644
index c6a04585..00000000
--- a/ansible-roles/ssh-host-sign/tasks/main.yml
+++ /dev/null
@@ -1,33 +0,0 @@
----
-- name: Copy server key into VM temporarily
-  copy:
-    src: server_ca
-    dest: /tmp/server_ca
-    owner: root
-    group: root
-    mode: 0600
-
-- name: Sign Keys
-  command: ssh-keygen -s /tmp/server_ca -I key_for_test1 -h -V +52w /etc/ssh/ssh_host_{{ item }}_key.pub
-  with_items:
-    - rsa
-    - ecdsa
-    - ed25519
-
-- lineinfile:
-    path: /etc/ssh/sshd_config
-    regexp: "^HostKey /etc/ssh/ssh_host_{{ item }}_key"
-    line: "HostKey /etc/ssh/ssh_host_{{ item }}_key\nHostCertificate /etc/ssh/ssh_host_{{ item }}_key-cert.pub"
-  with_items:
-    - rsa
-    - ecdsa
-    - ed25519
-
-- name: Ensure server key is gone
-  file:
-    path: /tmp/server_ca
-    state: absent
-
-- name: "Helper"
-  debug:
-    msg: "Please add the following to your known_hosts file: @cert-authority <ip-range|*.domain> {{ lookup('file', 'server_ca.pub')  }}"
diff --git a/ansible-roles/y-yu.texlive/.gitignore b/ansible-roles/y-yu.texlive/.gitignore
deleted file mode 100644
index 997ca2f8..00000000
--- a/ansible-roles/y-yu.texlive/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-.vagrant
\ No newline at end of file
diff --git a/ansible-roles/y-yu.texlive/.travis.yml b/ansible-roles/y-yu.texlive/.travis.yml
deleted file mode 100644
index 53778019..00000000
--- a/ansible-roles/y-yu.texlive/.travis.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-matrix:
-  include:
-    - os: osx
-      language: generic
-    - os: linux
-      language: python
-      dist: trusty
-      python: "2.7"
-env:
-  - ANSIBLE_VERSION="2.3.2.0"
-install:
-  - pip install ansible=="$ANSIBLE_VERSION"
-before_script:
-  - ansible --version
-script:
-  - ansible-playbook -i tests/inventory tests/test.yml --syntax-check
-  - ansible-playbook -i tests/inventory tests/test.yml --connection=local --sudo
-notifications:
-  webhooks: https://galaxy.ansible.com/api/v1/notifications/
diff --git a/ansible-roles/y-yu.texlive/LICENSE b/ansible-roles/y-yu.texlive/LICENSE
deleted file mode 100644
index 455abf81..00000000
--- a/ansible-roles/y-yu.texlive/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2017 Yuu YOSHIMURA
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
\ No newline at end of file
diff --git a/ansible-roles/y-yu.texlive/README.md b/ansible-roles/y-yu.texlive/README.md
deleted file mode 100644
index ece511c1..00000000
--- a/ansible-roles/y-yu.texlive/README.md
+++ /dev/null
@@ -1,66 +0,0 @@
-TeXLive
-=========
-
-[![Build Status](https://travis-ci.org/y-yu/ansible-texlive.svg?branch=master)](https://travis-ci.org/y-yu/ansible-texlive)
-
-TeXLive install role for Linux and macOS.
-
-## Install
-
-```
-$ ansible-galaxy install y-yu.texlive
-```
-
-## Requirements
-
-- Ansible 2.0 or higher
-- rsync (if you want to install full)
-
-### Why does the role use rsync?
-
-TeXLive installer (`install-tl`) uses HTTP to pull CTAN packages by default.
-But if the installer fails to download, it will start to download over.
-Rsync can resume to download, so this role uses rsync if you want to install full packages.
-
-## Role Variables
-
-```yaml
-# TeXLive install directory
-texlive_directory:
-  /usr/local/texlive
-
-# TeXLive mirror
-texlive_mirror:
-  http://ftp.jaist.ac.jp/pub/CTAN/systems/texlive/tlnet
-  
-# TeXLive rsync URL
-# This is used if you want to install full TeXLive
-texlive_rsync:
-  rsync://ftp.jaist.ac.jp/pub/CTAN/systems/texlive/tlnet/
-
-# TeXLive Scheme
-# full > medium > small > basic
-scheme:
-  small
-```
-
-## Dependencies
-
-None
-
-## Example Playbook
-
-```yaml
-- hosts: all
-  become: yes
-  roles:
-    - texlive
-```
-
-## License
-
-MIT (See [LICENSE](https://github.com/y-yu/ansible-texlive/blob/master/LICENSE))
-
-## Author Information
-
-Yuu YOSHIMURA
diff --git a/ansible-roles/y-yu.texlive/defaults/main.yml b/ansible-roles/y-yu.texlive/defaults/main.yml
deleted file mode 100644
index aedf855a..00000000
--- a/ansible-roles/y-yu.texlive/defaults/main.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-texlive_directory:
-  /usr/local/texlive
-
-texlive_mirror:
-  http://ftp.jaist.ac.jp/pub/CTAN/systems/texlive/tlnet
-texlive_rsync:
-  rsync://ftp.jaist.ac.jp/pub/CTAN/systems/texlive/tlnet/
-
-scheme:
-  small
diff --git a/ansible-roles/y-yu.texlive/meta/.galaxy_install_info b/ansible-roles/y-yu.texlive/meta/.galaxy_install_info
deleted file mode 100644
index c7b99086..00000000
--- a/ansible-roles/y-yu.texlive/meta/.galaxy_install_info
+++ /dev/null
@@ -1 +0,0 @@
-{install_date: 'Wed Oct 17 13:54:58 2018', version: master}
diff --git a/ansible-roles/y-yu.texlive/meta/main.yml b/ansible-roles/y-yu.texlive/meta/main.yml
deleted file mode 100644
index 8e9d7448..00000000
--- a/ansible-roles/y-yu.texlive/meta/main.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-galaxy_info:
-  author: Yuu YOSHIMURA
-  description: TeXLive Install Role for Linux and macOS
-  license: MIT
-  min_ansible_version: 2.0
-  platforms:
-    - name: MacOSX
-      versions:
-        - all
-    - name: Ubuntu
-      versions:
-        - trusty
-  galaxy_tags:
-    - texlive
-    - tex
-    - latex
-    - system
-dependencies: []
diff --git a/ansible-roles/y-yu.texlive/tasks/main.yml b/ansible-roles/y-yu.texlive/tasks/main.yml
deleted file mode 100644
index 0a4a216a..00000000
--- a/ansible-roles/y-yu.texlive/tasks/main.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-#- name: "Include OS specific variables"
-  #include_vars: "{{ ansible_os_family }}.yml"
-
-- name: "Download TeXLive Installer"
-  get_url:
-    url: "{{ texlive_mirror }}/install-tl-unx.tar.gz"
-    dest: /tmp/install-tl-unx.tar.gz
-  when: scheme != "full"
-
-- name: "Unarchive TeXLive Installer"
-  shell: tar -xf /tmp/install-tl-unx.tar.gz -C /tmp
-  when: scheme != "full"
-
-- name: "Rsync TeXLive Repository"
-  shell: "rsync -a --no-perms --no-owner --no-group --delete --exclude=mactex* --partial {{ texlive_rsync }} /tmp/tlnet"
-  when: scheme == "full" and texlive_rsync is defined
-
-- name: "Create Profile"
-  template:
-    src: install-tl.profile.j2
-    dest: /tmp/install-tl.profile
-
-- name: "Make {{ texlive_directory }} Directory"
-  file:
-    path: "{{ texlive_directory }}"
-    state: directory
-
-- name: "Install TeXLive from Local"
-  shell: cd /tmp/tlnet && chmod +x install-tl && ./install-tl -profile /tmp/install-tl.profile -repository /tmp/tlnet
-  when: scheme == "full"
-
-- name: "Install TeXLive from Remote"
-  shell: "cd /tmp/install-tl-* && ./install-tl -profile /tmp/install-tl.profile -repository {{ texlive_mirror }}"
-  when: scheme != "full"
-
-- name: "Show LaTeX Version"
-  shell: latex -v
-  register: latex
-  environment:
-    PATH: "{{ texlive_directory }}/bin/x86_64-linux:{{ ansible_env.PATH }}"
-
-- debug: msg="{{ latex.stdout }}"
-
diff --git a/ansible-roles/y-yu.texlive/templates/install-tl.profile.j2 b/ansible-roles/y-yu.texlive/templates/install-tl.profile.j2
deleted file mode 100644
index f9dee120..00000000
--- a/ansible-roles/y-yu.texlive/templates/install-tl.profile.j2
+++ /dev/null
@@ -1,10 +0,0 @@
-selected_scheme scheme-{{ scheme }}
-TEXDIR {{ texlive_directory }}
-TEXMFSYSCONFIG {{ texlive_directory }}/texmf-config
-TEXMFSYSVAR {{ texlive_directory }}/texmf-var
-TEXMFHOME ~/texlive/texmf
-TEXMFVAR ~/texlive/texmf-var
-TEXMFCONFIG  ~/texlive/texmf-config
-TEXMFLOCAL ~/texlive/texmf-local
-option_doc 0
-option_src 0
diff --git a/ansible-roles/y-yu.texlive/tests/inventory b/ansible-roles/y-yu.texlive/tests/inventory
deleted file mode 100644
index 2fbb50c4..00000000
--- a/ansible-roles/y-yu.texlive/tests/inventory
+++ /dev/null
@@ -1 +0,0 @@
-localhost
diff --git a/ansible-roles/y-yu.texlive/tests/test.yml b/ansible-roles/y-yu.texlive/tests/test.yml
deleted file mode 100644
index f93e1e54..00000000
--- a/ansible-roles/y-yu.texlive/tests/test.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-- hosts: all
-  remote_user: root
-  become: yes
-  vars_files:
-    - ./vars.yml
-  roles:
-    - role: ../..
diff --git a/ansible-roles/y-yu.texlive/tests/vars.yml b/ansible-roles/y-yu.texlive/tests/vars.yml
deleted file mode 100644
index dc3024dd..00000000
--- a/ansible-roles/y-yu.texlive/tests/vars.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-texlive_mirror:
-  http://ctan.sharelatex.com/tex-archive/systems/texlive/tlnet
-texlive_rsync:
-  rsync://mirror.jmu.edu/CTAN/systems/texlive/tlnet/
diff --git a/ansible-roles/y-yu.texlive/vars/Darwin.yml b/ansible-roles/y-yu.texlive/vars/Darwin.yml
deleted file mode 100644
index bd10780b..00000000
--- a/ansible-roles/y-yu.texlive/vars/Darwin.yml
+++ /dev/null
@@ -1 +0,0 @@
-os: darwin
diff --git a/ansible-roles/y-yu.texlive/vars/Debian.yml b/ansible-roles/y-yu.texlive/vars/Debian.yml
deleted file mode 100644
index bdf46ff1..00000000
--- a/ansible-roles/y-yu.texlive/vars/Debian.yml
+++ /dev/null
@@ -1 +0,0 @@
-os: linux
diff --git a/ansible/boot_files/.keep_dir b/ansible/boot_files/.keep_dir
new file mode 100644
index 00000000..e69de29b
diff --git a/ansible/external.yml b/ansible/external.yml
new file mode 100644
index 00000000..4489da14
--- /dev/null
+++ b/ansible/external.yml
@@ -0,0 +1,5 @@
+---
+- hosts: external
+  roles:
+    - lock-root
+    - cloudinit
diff --git a/ansible-roles/files/daemon.json b/ansible/files/daemon.json
similarity index 52%
rename from ansible-roles/files/daemon.json
rename to ansible/files/daemon.json
index 1368c6a7..9f104161 100644
--- a/ansible-roles/files/daemon.json
+++ b/ansible/files/daemon.json
@@ -1,4 +1,4 @@
 { 
-    "graph": "/scratch/docker",
+    "data-root": "/scratch/docker",
     "dns": ["8.8.8.8", "8.8.4.4"]
 }
diff --git a/ansible/files/meta_walltime.py b/ansible/files/meta_walltime.py
new file mode 100644
index 00000000..fdc0165e
--- /dev/null
+++ b/ansible/files/meta_walltime.py
@@ -0,0 +1,73 @@
+#!/usr/bin/env python
+# ===============================================================================
+# Copyright (c) 2016 by Frank Fischer
+# ===============================================================================
+from __future__ import unicode_literals, print_function, with_statement
+
+import os
+import pickle
+import re
+import time
+
+
+def get_times():
+    """
+    Retrieve wall time from cloud-init meta-data.
+
+    Cloud-Init saves all passed meta-data into a cloudinit.sources.DataSource object with attribute 'metadata'
+    A DataSourceOpenStack object stores information on additional metadata in a sub-dictionary 'meta'."""
+    try:
+        with open("/var/lib/cloud/instance/obj.pkl", "r") as file_:
+            data = pickle.load(file_)
+    except IOError:
+        return
+
+    meta = data.metadata.get("meta")
+    if meta is None:
+        raise EnvironmentError("Wrong virtualization environment.")
+
+    keys = [x for x in meta.keys() if re.search(".*Wall.*Time", x, re.IGNORECASE)]
+    if len(keys) != 1:
+        if len(keys) == 0:
+            raise ValueError("No meta-data entry with key 'WallTime'")
+        else:
+            raise ValueError("Ambiguous meta-data found: %s" % keys)
+
+    walltime = int(meta.get(keys[0]))
+    starttime = int(os.stat("/var/lib/cloud/instance/obj.pkl").st_ctime)
+    return walltime, starttime
+
+
+def save_env(wall_time_=None, start_time_=None, environment_file="/etc/environment"):
+    """
+    Save wall-time information to system variables WALLTIME & BOOTTIME.
+
+    Values by default are stored in /etc/environment, discarding old wall-/boottime entries, preserving the rest.
+    """
+    if not os.access(environment_file, os.W_OK):
+        raise EnvironmentError("Can't write to %s" % environment_file)
+
+    with open(name=environment_file, mode="r") as file_:
+        # keep results != WALLTIME/BOOTTIME
+        content = [entry for entry in file_.readlines() if re.match("(?:WALL|BOOT)TIME", entry, re.IGNORECASE) is None]
+        if wall_time_ is not None:
+            content.append("WALLTIME=%d\n" % wall_time_)
+        if start_time_ is not None:
+            content.append("BOOTTIME=%d\n" % start_time_)
+    with open(name=environment_file, mode="w") as file_:
+        file_.writelines(content)
+
+
+if __name__ == "__main__":
+    try:
+        wall_time, start_time = get_times()
+        # Condor parses stdout as configuration file content
+        print("MachineMaxWalltime=%d" % wall_time)
+        print("MachineStarttime=%d" % start_time)
+        save_env(wall_time, start_time)
+    except (ValueError, EnvironmentError, TypeError):
+        # Fall back on reading /proc/uptime
+        with open("/proc/uptime", "r") as _file:
+            uptime = float(_file.readline().split()[0])
+        boot_time = int(time.time() - uptime)
+        print("MachineStarttime=%d" % boot_time)
diff --git a/ansible-roles/files/server_ca b/ansible/files/server_ca
similarity index 100%
rename from ansible-roles/files/server_ca
rename to ansible/files/server_ca
diff --git a/ansible-roles/files/server_ca.pub b/ansible/files/server_ca.pub
similarity index 100%
rename from ansible-roles/files/server_ca.pub
rename to ansible/files/server_ca.pub
diff --git a/ansible/files/ssh_host_ecdsa_key b/ansible/files/ssh_host_ecdsa_key
new file mode 100644
index 00000000..b299b846
--- /dev/null
+++ b/ansible/files/ssh_host_ecdsa_key
@@ -0,0 +1,30 @@
+$ANSIBLE_VAULT;1.1;AES256
+65303966343136613531613036633032636265303539646666613763383737323236666664666230
+3761636439633237303835383634383030613866623035300a663532623436643838626566636239
+61356537363966363932333366613535353737346432656261623065363831393865323565396365
+6266616637346138390a323836646332383365643864396365383932383034346537303566393233
+37633836313261353565643231656339623631623939386266633038323039656366663264343839
+62653965353862326435393833396633303633353464633237303339333937373332633565616532
+37306162323964613465376431303038363336626563656136656633646639313064663365373261
+37636635396365623065383036623931393132333662356539646466373136323065346131613738
+33333165386530653763343133323834346432613234373739613836633036623530656132366562
+38636462346364383237393261343332376230383062623636326432336161346366363635386663
+65353363303464613162626431653662663265633831633761323163373535323633383532313833
+63633463616630656636616363326533356639373934326333393831636263356162656265323232
+36336464643831636562393130366662303661383738306534343136306363373261653832393064
+30626638383239393935656164363534666562326532333465316361626265343635386464343037
+61626132346632306139313532376633663432346337653564656561303533663836643462396434
+64353833373930643932376334306638373732356538666233383635336335393933363462396536
+38306161363861643131343731626637313431653439623761656266613634356361626262616437
+31643638663331343639376231343131656165633233343134303239633330333238306365396261
+32373135333938643337316165313339346330353339356164326465646364326165393563363361
+65616133346233386364623439333839643961316432376166353438333037663839326434663336
+38626332306335353062613439623338636363646537346161393763306535393634323334393136
+65393934373962303232363965356164613439663732356461633134666633613864653931333866
+37653432326164333938666466323864376636623435623436623332336163613430663839643833
+39373533323532316663663033383461323937616261316230653764316332326663396466616538
+65316664313936336132363961356433333134373339653933643665356135343563316164653066
+32373038626137393431373466663134626336656334383164663166393436356261656430663031
+39363236663366313832373163323134383139396463626261363038363261303864613033636234
+61663363613561626139663964386266393464653932356535643436396664316334666530383230
+31663762353661303661636635633465613465326562393338653633616536323139
diff --git a/ansible/files/ssh_host_ecdsa_key-cert.pub b/ansible/files/ssh_host_ecdsa_key-cert.pub
new file mode 100644
index 00000000..4ec56ad2
--- /dev/null
+++ b/ansible/files/ssh_host_ecdsa_key-cert.pub
@@ -0,0 +1,61 @@
+$ANSIBLE_VAULT;1.1;AES256
+61643235376338343961653330313132333964613834663662626462363137313963653530346633
+6463303030623131373164316566326139393132393536330a343637343162336531623832656561
+32636638646264613536353438633138613737656530663338646333396661326639366431653863
+6634643434373937380a613338383035393330353439313530323865313039343930653038613036
+39313865336638386261313863373737366231333237623332353931303731346661306535363939
+64303962313864636336653136383839313632663939393764393033393433383232383461323863
+39366334616538393534623535366463393566363563333936343236666566353431653464613939
+64636666313635356266366635613862363932623934626166396163323335626437303432646338
+66643666343261616133383035363731343965653834366566346564396430653563343932633563
+32656333343036646139313039613134636166643334333833326463303130346137376463336134
+62616561313736663737623061633136366564666432613837626339316239316237633763643565
+35663930353761313766666366626363393133393666383461366363613636306138353236303737
+36313434313832663336373333393338346333353731396239633462663530336330653166343931
+64326166336264313935623531656463313135636564653638383364356238353534636632373635
+37363136303138613536366235646263656365306337343133326466393135313336396439346439
+61326633643962643637343333353138333564656539306562353933613866666463643931633562
+62653163336266313338353061346332333631306630663735616561616332386537323861393061
+39363034653265363136346462623939646337633761633232376239326262663238613537313463
+30306263383936633730646465343838316139646466366130366239303734333333366335653635
+63323137353961656162363134376436396239353863336539353866396563613638326633616134
+31653865393538643261643336383730303664323035663364646161393563363030656538636139
+39356430633939643833373361303939306262613062376330383166353364643063616666656461
+32346339366333373964313534386133323734646139656666623830306666303836383435343834
+38323530653637313336663965383832636363613631306465643766373637613664316465643938
+36373861343730316435323763323531326263313834633537313035303835393936336237663262
+61343765376436646439393563373365336165666463656231396333373436383336313133666238
+65313330326134373764623830323064643538343661303964383862336163663666626562653230
+64663262623163623964663536303134653230393035613931666163343439383365633730653139
+38323961303361643635326435623234393139643034306263356337353430343938306231326466
+36653735366336303637303832303437303435393136643832653564373638653964383030313433
+64663832373133366239623933333836326561643132623066323966333765363739613233396133
+32326666616565383038663061316135356463663437663932343635393234326265383137383966
+61326231636361346337313638326538353735303533373962313363353763646366326664306265
+62393538336237616662633539396238383563626561616561623730306432613337376233303733
+38663639356232613063646265383466623263613666313930636433643663343335653761626637
+61346165376230386234656232393133316166373566326366363765333330616136313633326662
+37366538613439376661646163646435636137393030373330653464303737383233353831363933
+61313738366136343536653832646434303932376164363030643666303964396533303134643763
+33303063623234636533396635373962643832363734343162323337323930356464313639623134
+62666661303736353162613331346461333665323339326261396236363262316363326637313535
+66303965326632386564616639626436336639396130336664333032633562373366663630653330
+34633539343165306466653937643731323030666338383232336464323035643834323930316262
+39373332373535616633383261666631643064623162633364383736646131633962333361636164
+66373334313464306439366231636131336163313561613766363965663238326466323165323463
+31353563653231396637646561656133336262626162656232343633363235613863396161613434
+32396237363931626238373563356361623434313430636234393262383361666639373562303335
+66623366363235333663383030613464653434643439303134646266366138653661626638323030
+31303630653836653236316337363232613262306366643834336633376164323361653430353164
+35303833393765343933326534653534636239373535636362633632633364363263656139626466
+35623331656565393966343332343062343039656563643030666165366264306366643532333861
+65396661363731613766366235386538363930663334626566343661663536623538366261393230
+62383735326332393738376234383463623233653862306266616461333937363139303738383733
+32633463656131656534626262393235666165623031623263363535353865333633346232666231
+36353961386533653433613163353337646231303437303665613964616537633161373434613735
+35393861343863383862653539626235396261343535393730613431393333383431616535303338
+38383938643830306337646430386536363264353032356131646132646462313433353837396262
+31313662643130313663666363373463653139343365646136636366666130646666356665646232
+38306338663031656337653261356362346134643230363633623031326539623039353134323234
+31663130343630376631343033656539353837653735383661616563363366326333663231363530
+38313231303861616337
diff --git a/ansible/files/ssh_host_ecdsa_key.pub b/ansible/files/ssh_host_ecdsa_key.pub
new file mode 100644
index 00000000..69b292f5
--- /dev/null
+++ b/ansible/files/ssh_host_ecdsa_key.pub
@@ -0,0 +1,14 @@
+$ANSIBLE_VAULT;1.1;AES256
+64646238646362646639323934323531396134373536323030623966656335643061353733616164
+6432363136363636626236313037326661316635393566610a393463396262653333383763633738
+30386464316438313762356333653661386466376362626461636635366331396466616361626430
+3134616232363966660a643736333163623866613263376335363262303433336537653937313366
+39643062373738613230313762363535323439303264656136316339363466636230666632663639
+33646236306361613430653434623263343035383439303537613135333932313139366464383361
+30613732633339636239623265393231306537353062356337653332343265386235313165646338
+30643238633261336532323538656664306134633562393837386339633130613330316363633766
+35313034323631323636326436633137323632633431393266633634653333393237363234386432
+34353238336161666665323936323735353439373764363463356538613133613862646663633337
+31373339616265306361636463386263333831363433623565663361376363356130343136353034
+33666338653562663263663238343038626530366239333937643462633165393563646638373064
+6636
diff --git a/ansible/files/ssh_host_ed25519_key b/ansible/files/ssh_host_ed25519_key
new file mode 100644
index 00000000..30694c12
--- /dev/null
+++ b/ansible/files/ssh_host_ed25519_key
@@ -0,0 +1,26 @@
+$ANSIBLE_VAULT;1.1;AES256
+63373333626562313861333765366135323634326631613032383836333665666163363238333931
+6164653762633739383831323164613833613032623439350a636565306332313166376233626331
+34643030366162623065653734636163646135303365353538353563643636303162613465316633
+6635393335633732380a306666303561623464656334353633303534623738643437323439313036
+36303039323965646132653636356566356662366466366230373832313765613937626339346532
+39346437336334373762666663343731373733643239313363323562633632626462633864303364
+64346364633539396333346236386634613864653665613439306432336337303165313232643037
+62326430616338326564643764333363633162366139316231303464363437323133313138393637
+66343339393362336632646338373832303331666563303433396331313566616161346336623233
+38663464363239376430373036656536336434346465333562616537393538666635336230353162
+30663066396439393639626465343135646436663236643363386462666537303264643531333363
+65636230666365623136653239336231656661313364336232386438663861376233656239343061
+65333362333264383536626662636261646463316666653931656634666139396530643032303939
+30386339323132613139303230356561663238663239353063616162366666386639396239643662
+64306630636632353535633233646366643036663332643930663663626665373232313739336231
+32616236326561616232646163333038363262343765383530366631626165363365383336356530
+65393937373439323136373563333334313534313965333036643033303131366263636632353836
+33633535303231393566343766303430343838333234383439326466663665373035626333383833
+39623661666466343731376661663337363361613233353937643432313932373839386335393633
+36343037636666326566653934346563346333623563316633633663353839333963343139313364
+62613930326462363733653134333432316237356639326261373861383633333032353139306630
+37633738393839633864633536656232646130656230333163376437316435393232393666323566
+30623330316132636131623466346133303564313735653839333232393265383632626263396262
+33663664633961656634613463306231653761363535346366356532313664643035613432633339
+6237
diff --git a/ansible/files/ssh_host_ed25519_key-cert.pub b/ansible/files/ssh_host_ed25519_key-cert.pub
new file mode 100644
index 00000000..2679b329
--- /dev/null
+++ b/ansible/files/ssh_host_ed25519_key-cert.pub
@@ -0,0 +1,57 @@
+$ANSIBLE_VAULT;1.1;AES256
+32363261323936346632333535393166333936643633343434626661656361656663313466353939
+3130366139343063313135636333383039306461626536300a653539303336376630633863386532
+61396533636632373066386433626431333130373339333835646634663565613562386531383932
+3339613566303931300a353563303439386464316437376530633264306437626666313831656339
+31396366643662656539343934383366316562386165303334386539313837663438396165373431
+63646439653236613438666534313332666435643132613130643936653034353434306139346338
+33376361376336623039343032353464643766643261353032356138333133373364333736376666
+32623531643064633233323436663631323661396438623136373236306663313631633136373263
+31663435613030353831643430393035383866636636626535356333396235633161373431646661
+38643665656439666662653133346338323662666631346266373364373535346130316630346135
+36653561653039653030383466343239363962643831353265396464303033366138373937353431
+37316366326235373064356336616136653462363433313266323633633161303861623236666161
+61353563373436303530386165316262396538653738363062363362393664643631346633646365
+30393035623265663735363536396138313737386132656636623436386635393638393061643730
+38323864386265323735663964366132356464383032393731353036313938343038626630613261
+39653332303538356261323466366662343130636338363234626335386635316266396433613263
+30346262336665636433376561333336646339626164356336336133386634633737383032356138
+34666434623935363266313938366639643263356638656230343561633534623763366634323130
+31633561393763346531313533653037363130333837653136306365396465623734303962316431
+38386461336435333933643333636462643630666632613434623361356436633861303237636461
+39336134323230326435333838636436303565623537656134663166316666353437646266336438
+36386438396639316534333333313331356633666235383038636134306664666364393330633035
+61303137353761336462363063373436313665613936353233336639323062646438343862343133
+30623739353962313236326331363937666565646133616238353435323839303066303261623830
+64623661643336323862393764313735353136613734663537623566353234663030666139316365
+33373561333838396434326437376431366339613738363566653164633430633539353663663361
+65333862366633303832333834666133346235303339383634393361636632356235656639663563
+38333262356330373066356365306532346266643831353038316166393533656530616532633835
+30623531383230356461323234313733653561393339346364383738653430663538346563313832
+34643065346532646565646663613632386130636339623533623437396433376262396462376364
+66383731396536363633326137393861323938643934613362316137316263626533393533653433
+63333964353861383935623837333162316137373234363461356362326361363261643832393736
+63383337643433373164306231656461356664313163643932373337393062613664623765633430
+38643135323239626662623930666539343438313663316161303334663038633863326666373436
+63316537346366306364616636306135356437383762303031363339313562343762353233343762
+35356632383363353533626135323161393765613865326437346339393163383934353463306262
+34383232343531656330323363316564656238643030333462303034643762643166316133333737
+34616666656432616638386164623863383639633335633939323230366232333062643230383163
+66663165313762396132383463323764383861353831626530383032633163353565373134323534
+39363266666265323765383339353330313430656164646432393161383932303431303634376361
+64616438613666303066663930376666633061313266386631363563383039663636653465376465
+31306138613134656637313037333337313464343763643238343263376238303530326330653862
+35616232303332323834373431363465626330313530346364376365393434353363636630383033
+37303339333831653533643564366531643664613639383233363361316335333435313039316662
+34643266633535346464346135353531646163396465626364653731373064313638323236313031
+66333935333766646337656138633262626430643362366266363834646533663930363730316132
+31646661343137363835393566336261386636336231376562653861636464396663383236333836
+35633662373266396337383337366637386535333163663239356365313733663930613336663538
+31373638303635343661363939343663376639303235653864643330333839393131373435663831
+38303331303861653865383764323962343935666166313033643462386233303631626661343736
+35363231333561386365323166333434333866663261623638326139613664376363643632326433
+31356666386666633531363362323735623339633236646138306230643031363065643830366531
+66643738373838326265636463303766356334323763316462353830383939306566336138326430
+36623136633031343634643239616365373537373530353035633363363539333863633132353834
+32363334393533306265636163653235656561393330383163383762363962633862336235363665
+38613165356561313361
diff --git a/ansible/files/ssh_host_ed25519_key.pub b/ansible/files/ssh_host_ed25519_key.pub
new file mode 100644
index 00000000..1111412d
--- /dev/null
+++ b/ansible/files/ssh_host_ed25519_key.pub
@@ -0,0 +1,10 @@
+$ANSIBLE_VAULT;1.1;AES256
+37396138396234666261613635333464356138326463363465623231343132393261306338613338
+3634366239353865373636386261303036363332303761390a363231373239623761373461393062
+32356131356335626165663161363965646665653537313236303336353163303266353763373466
+3866666163336563380a323732363964343164303435336236353961636132303637396537663333
+32633135323939333436623033333263396666356562306333636366363435386336326565646334
+31363832613162303537626537386431366134313665663138646135313134656431336666363066
+35656438376234613263633030353039633737643936623632323634656539633063383264646135
+64313331363666613638666566663866313466663330636634376162646632653332656563323065
+3138
diff --git a/ansible/files/ssh_host_rsa_key b/ansible/files/ssh_host_rsa_key
new file mode 100644
index 00000000..c3d7e70d
--- /dev/null
+++ b/ansible/files/ssh_host_rsa_key
@@ -0,0 +1,135 @@
+$ANSIBLE_VAULT;1.1;AES256
+34376138373735383663393963346630633033396234333234323462386336626238336232336433
+6566643733353863383534353239613731656538663163390a393835323738316130656462626265
+38383434363162623939303065396264393265646333313863643330326638393133303537663430
+3933313365353139360a646230363166643630653034643166383863646437346339366663313135
+35323930323466646638633238663835666133663433316438396130613538313762613062633266
+62376465383336316433363438373139346335663537383461333465383837383737633633333434
+33653733383961663734303836336132656136396431306333656331336634636436393236383033
+32653336376438643465323966356336613031303566356437386664363166356430663830636462
+65643831343965653533323035643961663461646331313639313138343135353264313762353536
+66376661363736366535376665626138393663386639313430306364343334623833373563386633
+33663563616566363635373235373332363733393261623638333131623837643462376637396539
+39353137393465666662336539393038383935353834373433303935356632643066376135383764
+38643433623563643737616366393737656132373530623637616564333534303134643664323866
+65653839333837323739376435386139356437393064326261646336653461636137643830383138
+35656633313336663565383336346563346635346163373730356461363161633434626634333564
+38336330646631336334663839366236636462633239313630633138323331343439393261353563
+33313035623437396662643132386562623562393739303764396438353438336562333733666461
+39663064623162616530633965363130663131333131316461346564386339333339306432343330
+35613364383330626236353138373936373562346561623533333463313239653635343833646430
+32663534613532643133313264643830323235646330306432396638366661326136323831663964
+64663937303236666263666130393335306262663061393463366461343638633663333466376239
+35626335303735356530663033643331393539323662386533613864313338313932633437623135
+38656233663062383531393433316434663934356434336663363432653832393661643335666665
+36386166386139303939373532353131613537383534323937303535306538323634653136366439
+30663561626638643839663961663465373736653333336632373466353564336539383166643433
+65646165393564636134656562303438616433616564336161393831616232376637313835653936
+34363534653432313665616165396637616538393763346132663166653038616334333238636462
+37656637653030643839633030396231373831313132326630626337663461326563343335633961
+39646137346565363132613239656664376532363139363066323964326532396263643832656235
+34656430363932356538353332376564353837396664656530636434626265383131643666383034
+32623833333530636132616263383532383137623233373439333532386464626138333166326261
+33343432366439316436653838363833376535386532633763336138636333353237643538346261
+33353633396363366439653966326531326433646363313232363133373030623764346131356535
+61396537636133363030383937383137393433626437656636383639363139313033333362343161
+62386662653439653461323462613130623131393861356463626265616663623635626232343338
+32646632386663653634383034623435663330333863643464633433333735616262343335626330
+36616638323761666434666238333333383138303136353866616539623532633666363536636264
+30623364343063383461333164363863613233646533366535663330363264323937376664363263
+66363664303238633561643931333430393461336564663062653830303833376534326662616535
+62613961396564643563303265363330316137306366303465393035663330313636376466383035
+63626435613262653434366137613665646537306533336531383532313233353839316233623734
+63636536386465376637633331663634336461653235363931353762313133313935623031633662
+65653263313238373933363935616535663638646637653435343261323931366633613439313264
+64343133613434366464313534303862313633616363366236643334636133353537623264636466
+36396631633738303931646233393336666633343664343263363734616430353766343538326635
+38623334616566393861613065393734346465636366633064666330613938613063663632616464
+30636161663235303535303834356438653265343234626163653065613731376233373038623435
+30383537396534336235366336363963626663613639643264373861633464376565646137303134
+65636664393936656665643031653931313364386238643965393636363137623736633864373734
+62346530323161643831656266653764666165383935666564323935323638316433326264653264
+38306435633430653134346332393530376264653864303836643735326534303530373630616234
+34353164396136396535356136356264356431633634316662663763336236393635373134646665
+35653736333866666361636234303931623831306666306562363737396132646333316330666261
+35316234656661316233643936646462366437663536376461383865663334343930363839373831
+61356135343633623062383463636464643963613234376134613261653437663562376238353461
+37323531666139626436373161333537323765333839393263366537656131663238393235663535
+36656263646332346665636431346365376430313838353265626563303939666138396362663861
+64343431383665373730626361333135373030346538333033373730653137313332333135306336
+31353430306131653434336335346161663265313230376236663631626466303134666665356265
+32343734326566323434323865663664343936653564326536363561303534623062363930373832
+30633465303430313038666630326461623331326435353339656139333234646233333739323631
+32653566613237306334366462373831623332396234343936623363343038396134623561653138
+61316632633861326436376637333230363337646466633236616130386533656165383862613663
+61356530383138326331623335346665323337663930643739326461613136346536343634333664
+30623236343730656135326335653039663732383162636534376565376265623130386562393330
+35666138393166373739626435373437666566303137343636303135306361356561323063346664
+32646538636563373632306166323565326361363162326531343364313962366430343565363665
+64643462363533333765383433303263663435336562666636646135363134346364653063383932
+31616432633235663438306234313361653663323531323866383530656561633161393930303332
+66373930356563616533623935613037666333363035656634333532323334333864366366393133
+31663232396131663735333164373062343363663463613334316334633732393464336234396234
+37373565333735376566646233363532363138643565333963623237653033303963343263616330
+64373837663437356232323163616437373338316430303765323766373662363431373430663236
+66363863363533633136356237626165653831386631383532663663383664333336653233313034
+62623430623336316332383266333335393835653134343663656538653061616538613730393864
+62633066366666366166323861373436656439626432333461646434373735643266353336646261
+32383432666162646432313163303531303762363564303933633037363937663165666232663534
+35666232363531343761383539363762336163306635626331316563663635376336363363393035
+34313963303963346337303161656336636237303735346666613637393866356135356338316363
+33303836396237633535656230323062363132333435666438363637666263373330386663623034
+37383165303735663131343730616132613161633962333031653737613330376236343963383238
+30323130373264653165643132373134623833383337363865343631633063363561613863383461
+34356238363030353430646165653135343236623131343539643738373066373731363639623931
+34366636653561326637663839366133653865303738613633363966363336393233666133663031
+32663032666536656462663036306536363036396366373538313632646637393033643232663036
+62393232346538386230646566656331376634623566633835633262326164366635363736376439
+35333066626566646333396364636233306137613239646163343063656364306531343231623164
+64633139653536653533303363306531383064303765623936346331373234646666663564373365
+36326565633633616665363732653431363130666562303062346439363937633066316261316662
+66316638643036626537323066386564383464336639373466623335616239346333303333376562
+63656663653661323437353237386265353766333238376261326539303865356362363731646463
+37626563333837393039633232363961613434633633633236376639623031653963666165393965
+62363164616266396537343534323165353163653663396564333237393539383936643266623937
+33376163353337623962653061366562663662383534353237656636646262626266616338393061
+33363434653131363330616462316162363065633362646238343862376139346666663632343330
+61363831623238633038663631646334353830643334383864666264646337636532363539396265
+30623263366430386639323736646364636135626630353539346234663635316361336632386565
+62653964353236376134336665376566303630373762336634343732313934666462323662316664
+32363262646232626631363263366230653435326639326337396462666238393061393939386539
+39303538303839353537636236656561313161316264643337373236616230663462653365656232
+32373465386463386262386432613436613536363462363235663638613731396530333237313435
+64656231626537383362343661643238396133336566383731333366623931303339343139653635
+37623463646533636264636434393433663165623736666466393064366639343666313833613061
+36313463626134336664313666353538343130356662643866356663386166636462646166353930
+66626339306136303739616666663630336465643333313235326465386166623839383438336532
+32313838393435313064306438333439383666323830623264633338396436393137353331663864
+35333734643939313831636661393565373237633563346364383335616461316232396234613538
+62313061343564636133323064393361393030623564323862313638656335306465633031323334
+31336165633830366466636536653865613236313837343730666639353064373035666564643563
+34396665643635653330316631303636636665353235653134356537623730383462343339313234
+65633736366339623935643861373561313334343333613765343962313364656631356561363639
+38613638346532633961333438623535626262643262643866393530326132386664376365633837
+63333735656637313866363931643635626634326263656235323262633733643463373861356164
+36356466313532313935666133316230356561323565376436616532346637373133653866386138
+62336261343231336237366139373238613633343239386133393362666339656531346334393766
+65373965666231323034336130346163313832353035353932643264396661633566616661323539
+35393562316333376632306137303734383337363632333036386163306637626535386564666661
+33306366643533366133323338633133646166333039396238346638396435363133393665353135
+66663536643964303134373030666633663634653765333964376137303364306233306433303264
+66366135353363343535613136366433656365396231613237613563356636323237353532393535
+63316531393062656436316366316162363866356438633134623535613765623562616238326635
+61646464633933363838346437663962313661313837373530633839306661313037663638323562
+30613233383533626335343335393636643032373433306635636338343938373932663539376132
+32626532666230333433653934626362623339303135656264323738316366626366663433333137
+31363436633134636161646561336164623130333036633831623137653236616538353365313634
+38323533626364303330383363623037373435623664343163376264336330323237313834666537
+62613466383739333966633430653839383535363030663334353438363633666463636562633364
+34663839626435623139363632306364623938343034316539646538303239383034383831326164
+30303463356264616634643032366532366363336332373630666262613161663737316461643639
+38643663316538613766636332336133363833323137333134656265613461633037306538356238
+36376234306461343030653763346538353836313363636334386433643065336563303536366465
+65393139643138353065633161383132316166333639336438343239663533346639356163383864
+66336233653336313763323965396364353739626533373236633762666432373435326130363930
+3335373863393363346537636430306137313434333432623332
diff --git a/ansible/files/ssh_host_rsa_key-cert.pub b/ansible/files/ssh_host_rsa_key-cert.pub
new file mode 100644
index 00000000..338fd4ac
--- /dev/null
+++ b/ansible/files/ssh_host_rsa_key-cert.pub
@@ -0,0 +1,80 @@
+$ANSIBLE_VAULT;1.1;AES256
+37376432376431383537336535323263366136663336643134653564303733636462356638643062
+6534376364386161623466616266353934626630303336320a623632643131393632653032346365
+38633531326139336135613536393833353364373365353161363033313465633733313937353863
+3962626536346166610a363630396265396531643830393536323434343633396238373436373835
+62663735303034313161336165613763386366626362643664613737646533316663386633356132
+64633837623139336439343239323034636162323631643635346237376439393737373731333738
+31303035313063393266323764316232316636306239373266383035633738396139383539663732
+66333466343932626561613037343363663431633832636565366337613833303831636661623436
+65623331626433393238353266646130326265666261656336633631306137376137616432613137
+39363165623565656234633739383839386435316565613237336664643466303935663065633434
+31306133336536366564633437646230353437316430303564346438303363643962343939613630
+36386166383135626632393061663632386530333432393430613838643163363264376132386230
+37373932656531663261353233336438356133393337663166343165616336306237366635363163
+62333464343835643865326564376234366363356130306263353934333739656337646233393039
+35666533353066303366646166653933303838623936386163643234323030643664663535373135
+35373832663038306232353662363462613864333136336665316332386431653837326131356132
+38323961653130363939346638616334356263383835356165303066623237306231653961663366
+36383665623531303331653564313133613663336164336463323365343035323564313933383838
+37333131376430666231333030626165626532663933323631316332623138613235666530643530
+38343635666566366134633366316536623764616432373361303463633335653735616166306636
+62393666386236303833303439373033663839313366663866613632666661396332366633626631
+37643061333835636232346233633535393265396266373564326564356330313463363733656662
+66646661646565643464616634366133613061633034633038316134653938666665303164303834
+30643564343161306163393663626530323862333463313966653232356666356164356132653832
+31386334613764643136366661303165616433343639646339323433306435623861336334303631
+65666563656631346139333861326562323765616164643337613462373062663439353735306638
+35393734356165306438663737353665373836343962383536393238366566363634623237363631
+39306465333836613731623338316264656563383338666362343863323838623666353235346165
+65633565393763653131313837633365373462656266616636623539623838303964393139653339
+34663935636363636135333638653435396332616363656266343336336463353535366661643536
+35303735396531366237316230383662626438383064366463663732336238373036613465643135
+39393363633337313666373230306238363661653662373466643939393337636565643338386630
+37343766666339303234633931343735393132323331313230353562323762373433653134373762
+32626537656236613466653738356232623139363433653564623862623138653238656536323739
+36383939383761613163306533353234663464626663636563643939303138663139613831363362
+38633961636532616264646131653530356430383430626635643338616338316564373630393163
+36666632653431386161353263633332306133366335643463306539626362383133613963393139
+34346338313233386261376432643537303364353463666162613639623634343735613632373566
+63636537316531323134323062323566396163633766383762316236323639353235303536643233
+66653136333333333638376635623565303761643836613766303932363666396462613231666338
+37623935383361303332616432326634356238646565316263613932343533656537623661666661
+65326631626133336665396530313761353632353436326238636131663631643439616236366234
+62383739373233663333323738643331643962613837303334633736666366346630623635663335
+36363365306164306630326231613231643033623036346365363237346530346331326532353134
+37396365643633623338646562326238313163643735396264363735316165646238656261323865
+37666362333565383964626461393232346561616534623966306364333661616634343263613964
+66303463656438396334313338633065616237333237306566363766623934623939333364343539
+34653664666366386665383039656234663633393937366263633832643732333563323837353962
+31643935353663633936623634303161653834373934626366333463393537326535386636353933
+37383235653739636432613931613763666436666331653937623563636538643831396431313164
+64306139633234666232393961313730633166303463303161656163663962376237303834323530
+37666237346438656633353734343530363130303034646432383962366237613562656262353465
+62313837336365353935366462366431316136343032613838333735343461383461363930376466
+62656565366538623665323265326635323063653232366366613633633164303238373264353039
+33633838623063353031633766316236646336653431306430373063336630633831376636623337
+39363732613164663062333732616530383334316536323136376562626234646139623861326534
+32623631656339376566656537656363643632303932393164373232386462656430316163306133
+33366165623335323839353535363139333431386339613136383235396461396566393830323234
+38646562363762663732656162336336643364646237653266383266656661316230633163333735
+37333430376431316433363133633633383362306264323965386662303762306665656236383633
+61653066376565343730333634636533333066333730373966303665353535653534346530383037
+65323863666163303934633231363066663532633336383239663333353064373136356434346637
+62633833663139303830396666666463613864643036653536613165366564363533393139306566
+38356336343037353438343134333431646633636636303837613839643037333064653164323131
+34323137363433633263306464643833666339646539393939366634663564353037313462633739
+34383834303737343739633632643262323937613836656663313239613265393264656366333264
+37303231346466663931316631653134396433373339636431653637383136316330323163383733
+61626333643662373338623464663937323665663637343534353163663235666434643231373730
+62393337323034663166323466326366363336386435316164393966643837346339373462383936
+38343930306330326531636562633631646439303930393139386137653534363665393837623932
+65396165323836376333343934356161333839353733363061303930663664626533623435356562
+30373661353838643830383462333937613761666133343162343433366161613738306162633731
+62383464303733323463393862393430666539396565376639633962363038633934366639343861
+61613834613166336335656166616135343062643866303462663561623563353330373233626264
+32643039356461643962616132356534366336666361383861376561376265646234646164633734
+39656361643330616236633966656165373230663236326535363433646437623535316132326239
+65393364616332666462323639366534623533633862346564393338343133303531623533636136
+33303932353763343535653565666536653432656464623766326165376339313234616166633232
+343137323865666335653530613430633332
diff --git a/ansible/files/ssh_host_rsa_key.pub b/ansible/files/ssh_host_rsa_key.pub
new file mode 100644
index 00000000..8ee970db
--- /dev/null
+++ b/ansible/files/ssh_host_rsa_key.pub
@@ -0,0 +1,34 @@
+$ANSIBLE_VAULT;1.1;AES256
+62663432633263623037383064326465366633656436356634376566333264656232666163386164
+6537313166623532633962663561343865663064633065650a376663623333386261343833616365
+65386366366266643061396465666535356165346163663935326332363463656361653361306366
+3064346539623762360a343562383166336634613866663833336261356336613139626133343566
+35626433333036623863393761323663366333623135313161333035363536633434343330346433
+38633936643265626234383966383138386436613636376461363638656565636439393734373339
+65393130343736363036323761313466626532326364333234393638636438626664313831366665
+36613939316539636135663337306436366162323239613832333362626330393632383336306132
+61376132633961366230373862386535336665313063386363366534323637346564656535616430
+66373138656133643161326139623534643036303266323134303931623739623037303037366234
+39326662393432626261643161323437373731303133363539363263623066383962376664666330
+65626336393035636132363839383466633130343362366535326431616462646464643662323064
+66626365313864326264353230313632616535663436613334613239313732383535636336666464
+37616637396666323864643362303266376132343238656561313732373136326461666164333335
+36373430636561656639313332393338633834323664653435636137653561333330623935363933
+65336331636163646636656530316336333732373363646164653534636162323735636439666230
+38373965366432366565666135333035663336333961643364326464386662343366343335386236
+38623937333038376330633766663634643261346166366536666631393437616561616462313139
+35363064623566353138666661376163376466376132383764383535316136316534336130616634
+36663363353765613765383165656238616438646639643261363837643763633666363635633438
+34303435633766646262363762666335393235323037376462636266643631386231363163643566
+38343365313433366535313163356663383135393237653938323730303333666135333364626364
+37333131626131363464636463363334626464646264623636656437326430353365333365383965
+33393030346238373934396232366139373834623166303236386161363931393434643030613163
+66653738663735663039363630346538316432376336383966366139363231646364653763333539
+63626365633432633266633332626636383864653466653038303634346334636137646430306365
+65636131386331343064393336323162623362353331626561393234616532653364333333633766
+32353039636166616265373033353364343562633264303762393933646239623637306331316133
+36643732303131373166373064643034656536663539316435303734316664336436363364633035
+33663536333337666537666232343132333036633962643634653036356639393130393436303730
+38666132353861376332613230316163363765626665643165373637303664646233383637383265
+32356331336665393430303234323131663263626637326435633863393163613734373162356430
+3033
diff --git a/ansible/generic.yml b/ansible/generic.yml
new file mode 100644
index 00000000..eacd6ade
--- /dev/null
+++ b/ansible/generic.yml
@@ -0,0 +1,64 @@
+---
+- hosts: generic
+  vars:
+    software_groups_to_install:
+      - admin
+      - editors
+      - terminals
+      - utils
+  pre_tasks:
+    - name: Ensure group Galaxy exists with correct gid
+      ansible.builtin.group:
+        name: galaxy
+        state: present
+        gid: 999
+    - name: Add the user Galxy
+      ansible.builtin.user:
+        name: galaxy
+        uid: 999
+        group: galaxy
+    - name: Debug Kernel version
+      ansible.builtin.shell:
+        cmd: uname -r
+      register: kernel
+    - name: Print kernel version
+      ansible.builtin.debug:
+        msg: "{{ kernel }}"
+    - name: system update (without kernel update)
+      ansible.builtin.dnf:
+        name: "*"
+        exclude:
+          - kernel*
+          - kmod-kvdo
+        state: latest
+    - name: Put SELinux in permissive mode, logging actions that would be blocked.
+      ansible.posix.selinux:
+        policy: targeted
+        state: permissive
+    - name: Enable firewalld service
+      ansible.builtin.systemd:
+        name: firewalld
+        enabled: true
+        state: started
+    - name: Create Staponpriv user homedir, see issue 23
+      become: true
+      ansible.builtin.file:
+        path: /var/lib/stapunpriv
+        state: directory
+        owner: root
+        group: root
+  roles:
+    - role: usegalaxy_eu.handy.os_setup
+      vars:
+        enable_create_user: true
+        enable_powertools: true
+        enable_install_software: true
+        enable_grub: true
+        enable_kernel_5: "{{ true if (ansible_facts['distribution_major_version'] < '9') else false }}"
+
+    - geerlingguy.repo-epel # Install EPEL
+    - usegalaxy-eu.autoupdates # keep all of our packages up to date REMOVED until latest kernel is supported in dnbd3
+    #- usegalaxy-eu.ffmpeg # Uncommnet this to fix https://github.com/usegalaxy-eu/issues/issues/550 
+    - usegalaxy-eu.dynmotd
+    - influxdata.chrony
+    - usegalaxy-eu.telegraf
diff --git a/ansible-roles/group_vars/all.yml b/ansible/group_vars/all.yml
similarity index 73%
rename from ansible-roles/group_vars/all.yml
rename to ansible/group_vars/all.yml
index 29bbe836..4c73ae81 100644
--- a/ansible-roles/group_vars/all.yml
+++ b/ansible/group_vars/all.yml
@@ -1,7 +1,7 @@
 ---
 vg_build: 60
 # This will be replaced by jenkins.
-build_tag:  vggp-v##-j##-##-branch
+build_tag: vggp-v##-j##-##-branch # overriden by packer var set in build.py
 
 cloud: bwCloud
 
@@ -10,8 +10,8 @@ galaxy_gid: 999
 
 replace_non_galaxy_999: true
 
-telegraf_agent_version: 1.17.2
-telegraf_agent_output: {}
+telegraf_agent_package_state: latest
+telegraf_yum_gpgcheck: false
 telegraf_agent_tags:
   - tag_name: datacenter
     tag_value: rz
@@ -43,10 +43,6 @@ telegraf_plugins_default:
       - commands = ["/bin/iamalive"]
       - name_suffix = "_alive"
 
-java_packages:
- - java-11-openjdk
- - java-11-openjdk-devel
-
 # CVMFS
 cvmfs_role: client
 galaxy_cvmfs_repos_enabled: true
@@ -63,11 +59,18 @@ galaxy_cvmfs_server_urls:
 # dynmotd
 dynmotd_custom:
   - name: Build
-    command: "echo VGGP build {{ cloud }} {{ build_tag }}"
+    command: "echo VGCN build: {{ build_tag }}"
   - name: Build date
     command: "echo  {{ ansible_date_time.iso8601 }}"
 
 # Docker
+docker_packages:
+  - docker-ce
+  - docker-ce-cli
+  - containerd.io
+  - docker-buildx-plugin
+  - docker-compose-plugin
+  - docker-ce-rootless-extras
 docker_users:
   - centos
   - condor
@@ -100,6 +103,13 @@ autofs_service.enable: True
 nfs_kernel_tuning: True
 nfs_kernel_tuning_parameters:
   sunrpc.tcp_max_slot_table_entries: 100
+handy_groups:
+  - group_name: galaxy
+    group_gid: 999
+handy_users:
+  - user_name: galaxy
+    user_uid: 999
+    user_group: galaxy
 
 # usegalaxy_eu.handy.os_setup
 # ansible_root_cron
@@ -108,12 +118,17 @@ ansible_root_cron:
     weekday: "{{ 7 | random }}"
     minute: "{{ 60 | random }}"
     hour: "{{ 5 | random }}"
-    job: "docker system prune -f"
+    job: "docker system prune -a -f"
   - name: "Stop containers running more than 1 months"
     weekday: "{{ 7 | random }}"
     minute: "{{ 60 | random }}"
     hour: "{{ 5 | random }}"
     job: "/usr/bin/docker-stop-1M"
+  - name: "Vacuum logs older than 7 days"
+    weekday: "{{ 7 | random }}"
+    minute: "{{ 15 | random }}"
+    hour: "{{ 2 | random }}"
+    job: '/usr/bin/journalctl --vacuum-time="7 days"'
 
 ## packages
 software_groups_to_install:
@@ -128,3 +143,8 @@ software_groups_to_install:
 
 ## kernel_5
 kernel_5_package: kernel-ml
+
+docker_daemon_options: {}
+
+ssh_host_keys_group: "{{ 'ssh_keys' if (ansible_os_family == 'RedHat' and ansible_distribution_major_version | int <= 9) else 'root' }}"
+ssh_host_keys_mode: "{{ '0640' if (ansible_os_family == 'RedHat' and ansible_distribution_major_version | int <= 9) else '0600' }}"
diff --git a/ansible/group_vars/external.yml b/ansible/group_vars/external.yml
new file mode 100644
index 00000000..35fb7b75
--- /dev/null
+++ b/ansible/group_vars/external.yml
@@ -0,0 +1,7 @@
+---
+telegraf_agent_output:
+  - type: influxdb
+    config:
+      - urls = ["http://localhost:8086"]
+      - database = "telegraf"
+      - precision = "s"
diff --git a/ansible/group_vars/internal.yml b/ansible/group_vars/internal.yml
new file mode 100644
index 00000000..ed97d539
--- /dev/null
+++ b/ansible/group_vars/internal.yml
@@ -0,0 +1 @@
+---
diff --git a/ansible-roles/group_vars/java.yml b/ansible/group_vars/java.yml
similarity index 100%
rename from ansible-roles/group_vars/java.yml
rename to ansible/group_vars/java.yml
diff --git a/ansible/group_vars/kvm.yml b/ansible/group_vars/kvm.yml
new file mode 100644
index 00000000..a1ef693d
--- /dev/null
+++ b/ansible/group_vars/kvm.yml
@@ -0,0 +1,2 @@
+---
+ssh_permit_root_login: "no"
diff --git a/ansible-roles/group_vars/pulsar.yml b/ansible/group_vars/pulsar.yml
similarity index 90%
rename from ansible-roles/group_vars/pulsar.yml
rename to ansible/group_vars/pulsar.yml
index 5c1a5360..f7950efa 100644
--- a/ansible-roles/group_vars/pulsar.yml
+++ b/ansible/group_vars/pulsar.yml
@@ -1,6 +1,7 @@
 pulsar_package_name: pulsar-app
-pulsar_package_version: 0.14.13
+pulsar_package_version: 0.15.6
 
+pulsar_virtualenv_command: "python -m venv"
 pulsar_root: /opt/pulsar
 pulsar_persistence_dir: /data/share/persisted_data
 pulsar_staging_dir: /data/share/staging
@@ -15,7 +16,6 @@ pulsar_systemd: true
 pulsar_systemd_enabled: false
 pulsar_systemd_runner: webless
 
-pulsar_virtualenv_command: virtualenv-3
 
 pulsar_separate_privileges: false
 pulsar_create_user: true
@@ -40,4 +40,4 @@ pulsar_yaml_config:
       type: queued_condor
     test:
       submit_universe: vanilla
-      type: queued_condor
\ No newline at end of file
+      type: queued_condor
diff --git a/ansible/group_vars/pxe.yml b/ansible/group_vars/pxe.yml
new file mode 100644
index 00000000..7b3b8231
--- /dev/null
+++ b/ansible/group_vars/pxe.yml
@@ -0,0 +1,16 @@
+---
+builder_branch: "master"
+builder_url: "http://git.openslx.org/openslx-ng/systemd-init.git/plain/build-initramfs.sh?h={{ builder_branch }}"
+builder_path: "/opt/systemd-init/build-initramfs.sh"
+builder_target: "{{ builder_path | dirname }}/initramfs"
+
+governor: schedutil
+
+packages:
+  - lsb-release
+  - "epel-release"
+  - "@development tools"
+  - "cmake"
+  - "git"
+  - kernel-devel
+  - kernel-headers
diff --git a/ansible/group_vars/workers.yml b/ansible/group_vars/workers.yml
new file mode 100644
index 00000000..b57fede4
--- /dev/null
+++ b/ansible/group_vars/workers.yml
@@ -0,0 +1,7 @@
+# Cuda
+install_cuda: true
+cuda_rhel8_package_name: cuda-11-6
+cuda_rhel9_package_name: cuda # pin later
+
+# Nvidia container
+install_nvidia_container: true
diff --git a/ansible/internal.yml b/ansible/internal.yml
new file mode 100644
index 00000000..f03ec275
--- /dev/null
+++ b/ansible/internal.yml
@@ -0,0 +1,65 @@
+---
+- hosts: internal
+  vars:
+    internal: true
+  pre_tasks:
+    - name: Debug Kernel version
+      ansible.builtin.shell:
+        cmd: uname -r
+      register: kernel
+    - name: Print kernel version
+      ansible.builtin.debug:
+        msg: "{{ kernel }}"
+    - name: Include secret vars
+      ansible.builtin.include_vars: "secret_group_vars/internal.yml"
+      when: "'internal' in group_names"
+    - name: Copy signed ssh public keys
+      ansible.builtin.copy:
+        src: "{{ item }}"
+        dest: /etc/ssh/
+        mode: 0644
+        owner: root
+        group: root
+      with_items:
+        - ssh_host_ecdsa_key.pub
+        - ssh_host_ed25519_key.pub
+        - ssh_host_rsa_key.pub
+        - ssh_host_ecdsa_key-cert.pub
+        - ssh_host_ed25519_key-cert.pub
+        - ssh_host_rsa_key-cert.pub
+    - name: Copy signed ssh private keys
+      ansible.builtin.copy:
+        src: "{{ item }}"
+        dest: /etc/ssh/
+        mode: "{{ '0640' if (ansible_os_family == 'RedHat' and ansible_distribution_major_version | int <= 9) else '0600' }}"
+        owner: root
+        group: "{{ 'ssh_keys' if (ansible_os_family == 'RedHat' and ansible_distribution_major_version | int <= 9) else 'root' }}"
+      with_items:
+        - ssh_host_ecdsa_key
+        - ssh_host_ed25519_key
+        - ssh_host_rsa_key
+      no_log: true
+    - name: Add HostCertificate options
+      ansible.builtin.lineinfile:
+        path: /etc/ssh/sshd_config
+        regexp: "^HostKey /etc/ssh/ssh_host_{{ item }}_key"
+        line: "HostKey /etc/ssh/ssh_host_{{ item }}_key\nHostCertificate /etc/ssh/ssh_host_{{ item }}_key-cert.pub"
+      with_items:
+        - rsa
+        - ecdsa
+        - ed25519
+    - name: Add core limit
+      community.general.pam_limits:
+        domain: galaxy
+        limit_type: hard
+        limit_item: core
+        value: 0
+  tasks:
+    - ansible.builtin.include_role:
+        name: cloudinit
+      when: "'cloud' in group_names"
+    - ansible.builtin.include_role:
+        name: cloudinit-pxe
+      when: "'pxe' in group_names"
+  roles:
+    - lock-root
diff --git a/ansible/kvm.yml b/ansible/kvm.yml
new file mode 100644
index 00000000..cd8ec8d2
--- /dev/null
+++ b/ansible/kvm.yml
@@ -0,0 +1,25 @@
+---
+- hosts: kvm
+  vars_files:
+    - secret_group_vars/kvm.yml
+  tasks:
+    - name: Ensure serial console getty exists (ttyS0)
+      become: true
+      ansible.builtin.systemd:
+        name: serial-getty@ttyS0
+        enabled: true
+        state: started
+  post_tasks:
+    - name: Change root password
+      ansible.builtin.user:
+        name: root
+        password: "{{ kvm_root_password | password_hash('sha512') }}"
+    - name: Install cloud-init and cloud-utils-growpart
+      ansible.builtin.package:
+        name:
+          - cloud-init
+          - cloud-utils-growpart
+        state: present
+  roles:
+     - devsec.hardening.ssh_hardening
+     - usegalaxy_eu.ssh_manager
diff --git a/ansible/playbooks-external.yml b/ansible/playbooks-external.yml
new file mode 100644
index 00000000..4b831842
--- /dev/null
+++ b/ansible/playbooks-external.yml
@@ -0,0 +1,17 @@
+# Meta-playbook for external builds that just imports all other playbooks.
+# Packer selects this playbook if 'internal' is not in the group names.
+#
+# It defines the order in which playbooks should be run during the provisioning
+# step. Each playbook contains plays that only apply to hosts belonging to a
+# group with the same name. Therefore, individual playbooks can be turned on
+# and off via the "groups" variable defined in "templates/variables.pkr.hcl",
+# which can also be overriden form the command line each time packer is
+# launched.
+---
+- ansible.builtin.import_playbook: generic.yml
+
+- ansible.builtin.import_playbook: workers.yml
+
+- ansible.builtin.import_playbook: external.yml
+
+- ansible.builtin.import_playbook: pxe.yml
diff --git a/ansible/playbooks-internal.yml b/ansible/playbooks-internal.yml
new file mode 100644
index 00000000..0d37977a
--- /dev/null
+++ b/ansible/playbooks-internal.yml
@@ -0,0 +1,20 @@
+# Meta-playbook for internal images that just imports all other playbooks.
+# This Meta-playbook is selected when packer finds 'internal' in the group names.
+# Requires a --vault-password-file=.vault_password argument in packer.
+#
+# It defines the order in which playbooks should be run during the provisioning
+# step. Each playbook contains plays that only apply to hosts belonging to a
+# group with the same name. Therefore, individual playbooks can be turned on
+# and off via the "groups" variable defined in "templates/variables.pkr.hcl",
+# which can also be overriden form the command line each time packer is
+# launched.
+---
+- ansible.builtin.import_playbook: generic.yml
+
+- ansible.builtin.import_playbook: workers.yml
+
+- ansible.builtin.import_playbook: internal.yml
+
+- ansible.builtin.import_playbook: pxe.yml
+
+- ansible.builtin.import_playbook: kvm.yml
diff --git a/ansible/pxe.yml b/ansible/pxe.yml
new file mode 100644
index 00000000..5624743a
--- /dev/null
+++ b/ansible/pxe.yml
@@ -0,0 +1,38 @@
+---
+- hosts: pxe
+  vars_files:
+    - group_vars/pxe.yml
+  pre_tasks:
+    - name: Debug Kernel version
+      ansible.builtin.shell:
+        cmd: uname -r
+      register: kernel
+    - name: Print kernel version
+      ansible.builtin.debug:
+        msg: "{{ kernel }}"
+    - name: Put SELinux in permissive mode, logging actions that would be blocked.
+      ansible.posix.selinux:
+        policy: targeted
+        state: permissive
+    - name: Alma|Rocky|CentOS | Install packages
+      ansible.builtin.yum:
+        name: "{{ packages }}"
+        state: latest
+        update_cache: yes
+        enablerepo: devel
+    - name: Remove CA (to be sure)
+      ansible.builtin.file:
+        state: absent
+        path: /tmp/server_ca
+    # From vgcn-infrastrucure playbook:
+    # - name: Copy Cvmfs Telemetry Listener
+    #   ansible.builtin.template:
+    #     src: telegraf-cvmfs-listener.conf.j2
+    #     dest: "{{ telegraf_agent_config_path }}/telegraf.d/cvmfs-listener.conf"
+    #     mode: "0640"
+    #     owner: telegraf
+    #     group: telegraf
+    #   no_log: true
+  roles:
+    - devsec.hardening.ssh_hardening
+    - openslx-ng.dracut
diff --git a/ansible-roles/cloudinit/defaults/main.yml b/ansible/roles/cloudinit-pxe/defaults/main.yml
similarity index 100%
rename from ansible-roles/cloudinit/defaults/main.yml
rename to ansible/roles/cloudinit-pxe/defaults/main.yml
diff --git a/ansible/roles/cloudinit-pxe/files/boot-cron.sh b/ansible/roles/cloudinit-pxe/files/boot-cron.sh
new file mode 100644
index 00000000..6a696df8
--- /dev/null
+++ b/ansible/roles/cloudinit-pxe/files/boot-cron.sh
@@ -0,0 +1,55 @@
+#!/bin/bash
+
+# Create user if it doesn't exist
+if ! id "centos" &>/dev/null; then
+    useradd -m -c "RHEL Cloud User" -s /bin/bash centos
+fi
+
+# Create scratch storage for PXE machines
+SCRATCH_DEVICE=/dev/mapper/tank
+SCRATCH_MOUNT=/scratch
+if [ -e /opt/openslx ]; then
+    if ! blkid "$SCRATCH_DEVICE" 2>/dev/null | grep -q 'TYPE="xfs"' ; then
+        if grep -qs "$SCRATCH_MOUNT " /proc/mounts; then
+            systemctl stop docker
+            sleep 2
+            umount "$SCRATCH_MOUNT"
+        fi
+        /usr/sbin/mkfs.xfs -f "$SCRATCH_DEVICE"
+    fi
+    if ! grep -qs "$SCRATCH_MOUNT " /proc/mounts; then
+        mount "$SCRATCH_DEVICE" "$SCRATCH_MOUNT"
+    fi
+fi
+
+# Change GalaxyGroup based on nvidia detection
+#if nvidia-smi &> /dev/null; then
+#    sed -i 's/.*GalaxyGroup = "training-pxe-test".*/GalaxyGroup = "training-pxe-test-gpu"/' /etc/condor/config.d/99-cloud-init.conf
+#fi
+
+# Ensure user is part of specified groups
+/usr/sbin/usermod -aG wheel,adm,systemd-journal centos
+
+# Set up passwordless sudo
+echo "centos ALL=(ALL) NOPASSWD:ALL" >/etc/sudoers.d/90-cloud-init-centos
+chmod 440 /etc/sudoers.d/90-cloud-init-centos
+
+sed -i 's|nameserver 10.0.2.3||g' /etc/resolv.conf
+
+# Set CPUPower to schedutil
+cpupower -c all frequency-set -g schedutil
+#ssh-keygen -s /tmp/server_ca -I key_for_test1 -h -V +52w /etc/ssh/ssh_host_rsa_key.pub
+#ssh-keygen -s /tmp/server_ca -I key_for_test1 -h -V +52w /etc/ssh/ssh_host_ecdsa_key.pub
+#ssh-keygen -s /tmp/server_ca -I key_for_test1 -h -V +52w /etc/ssh/ssh_host_ed25519_key.pub
+#rm -f /tmp/server_ca
+systemctl restart sshd
+systemctl restart telegraf
+systemctl restart docker
+
+# Add trim cron task
+cat <<EOT > /etc/cron.daily/trim
+#!/bin/bash
+# This script runs the fstrim command once a day and trims all the mounted file systems that support TRIM.
+sudo fstrim -v --all
+EOT
+sudo chmod +x /etc/cron.daily/trim
diff --git a/ansible/roles/cloudinit-pxe/tasks/main.yml b/ansible/roles/cloudinit-pxe/tasks/main.yml
new file mode 100644
index 00000000..d6087947
--- /dev/null
+++ b/ansible/roles/cloudinit-pxe/tasks/main.yml
@@ -0,0 +1,15 @@
+---
+- name: Copy user setup script
+  ansible.builtin.copy:
+    src: boot-cron.sh
+    dest: /usr/local/sbin/boot-cron.sh
+    owner: root
+    group: root
+    mode: '0755'
+
+- name: Ensure cron job exists for script at reboot
+  ansible.builtin.cron:
+    name: "Run centos user setup at boot"
+    user: root
+    special_time: reboot
+    job: "sleep 20 && /usr/local/sbin/boot-cron.sh > /var/log/init"
diff --git a/ansible/roles/cloudinit/defaults/main.yml b/ansible/roles/cloudinit/defaults/main.yml
new file mode 100644
index 00000000..9cd2ebb6
--- /dev/null
+++ b/ansible/roles/cloudinit/defaults/main.yml
@@ -0,0 +1,2 @@
+# enable tasks only for the internal version
+internal: False
diff --git a/ansible-roles/cloudinit/tasks/main.yml b/ansible/roles/cloudinit/tasks/main.yml
similarity index 100%
rename from ansible-roles/cloudinit/tasks/main.yml
rename to ansible/roles/cloudinit/tasks/main.yml
diff --git a/ansible-roles/lock-root/tasks/main.yml b/ansible/roles/lock-root/tasks/main.yml
similarity index 100%
rename from ansible-roles/lock-root/tasks/main.yml
rename to ansible/roles/lock-root/tasks/main.yml
diff --git a/ansible/roles/usegalaxy-eu.ffmpeg/tasks/main.yml b/ansible/roles/usegalaxy-eu.ffmpeg/tasks/main.yml
new file mode 100644
index 00000000..5e3187db
--- /dev/null
+++ b/ansible/roles/usegalaxy-eu.ffmpeg/tasks/main.yml
@@ -0,0 +1,10 @@
+# see https://github.com/usegalaxy-eu/issues/issues/550
+- name: Install RPMFusion
+  ansible.builtin.dnf:
+    name: "https://mirrors.rpmfusion.org/free/el/rpmfusion-free-release-{{ ansible_distribution_major_version }}.noarch.rpm"
+    state: present
+    disable_gpg_check: no
+- name: Install ffmpeg
+  ansible.builtin.dnf:
+    name: ffmpeg
+    state: present
diff --git a/ansible/roles/usegalaxy-eu.logrotate/defaults/main.yml b/ansible/roles/usegalaxy-eu.logrotate/defaults/main.yml
new file mode 100644
index 00000000..864c676f
--- /dev/null
+++ b/ansible/roles/usegalaxy-eu.logrotate/defaults/main.yml
@@ -0,0 +1,21 @@
+lp_logrotate_confd:
+  - path: galaxy
+    conf: |
+      /var/log/galaxy/*.log {
+        compress
+      	copytruncate
+      	daily
+      	notifempty
+      	missingok
+      	rotate 1
+      }
+  - path: atop
+    conf: |
+      /var/log/atop/atop_* {
+        compress
+      	copytruncate
+      	daily
+      	notifempty
+      	missingok
+      	rotate 1
+      }
diff --git a/ansible/roles/usegalaxy-eu.logrotate/tasks/main.yml b/ansible/roles/usegalaxy-eu.logrotate/tasks/main.yml
new file mode 100644
index 00000000..ced9de9e
--- /dev/null
+++ b/ansible/roles/usegalaxy-eu.logrotate/tasks/main.yml
@@ -0,0 +1,7 @@
+---
+- name: Create logrotate files
+  blockinfile:
+    path: "/etc/logrotate.d/{{ item.path }}"
+    block: "{{ item.conf }}"
+    create: true
+  loop: "{{ lp_logrotate_confd }}"
diff --git a/ansible/secret_group_vars/internal.yml b/ansible/secret_group_vars/internal.yml
new file mode 100644
index 00000000..51b41ce6
--- /dev/null
+++ b/ansible/secret_group_vars/internal.yml
@@ -0,0 +1,9 @@
+$ANSIBLE_VAULT;1.1;AES256
+63316561616263636262306466366364383066343862313131636134643262623661393239326436
+3233643965316232363266323461373562343864363232390a646632623364383965333136333837
+61646338636134613765346130616165626430323737333538343636333733333034666365333537
+3036393839666361630a646330336236386639386435643838623339613463346561393763306434
+39616539666364373938353238363164303937346231333961656263373966393762393233623334
+38653330646135373261363265636263626531313836373465633431396233383664343231346662
+36636265303664396338323661613431646265626530616430633763643632613666353030666564
+61386566313664306131
diff --git a/ansible/secret_group_vars/kvm.yml b/ansible/secret_group_vars/kvm.yml
new file mode 100644
index 00000000..e428c03c
--- /dev/null
+++ b/ansible/secret_group_vars/kvm.yml
@@ -0,0 +1,43 @@
+$ANSIBLE_VAULT;1.1;AES256
+36323339376635336333386338626635636430653233356135366562616334616131303330613731
+3733306265626566383161363632333431323337663034390a376430333161646432343533313266
+37653930386537393865643732653130346532313765623562326162306132386166383038396266
+3861633230663933610a343030643961313166366363356339376664616232373332386432323466
+62653861626366303866653336363261656566383335353262623938333937383237306237643665
+31303439306261393433323537383236303962343634646533373565316664333333386663393535
+66373338393636363166393232356166643738663966363764626564643438393334356465363062
+32336265366338383733373066643834633264616263313936306265363830383762313434353039
+61636363356632633231653435303938353737336333333064366334306334386433303563653861
+65306264653637343531363636363737303638383462343566366365376334373330363535376462
+34356332393731656134303434303230343065306239333865666261663864356330633565376639
+33303662366562303532306362643335303830333764373834366261646139376462366238653366
+63636232653936306539623032303638316532636438363766326164623536316563303131353366
+33646231643338363464653962633864383962303737663934333830386130616432363762626334
+39373436356231316638376363663332613231636538316635363637393465616238313639653262
+66623736613539633763616233316662616637663164353137343732616361356439306364393832
+38383339323464613832363036353066353363336262333162353532313261353263356563373433
+30633630326436626165303861313739346466313437303737313962616265326362363331373436
+39346335306338333335643565636161346565643336313861376431653763396364646234643666
+61316563343437303832343863363931613939333265623966656364316461326330336564306261
+65303732376638663136646331316238363066383764393339306166613239316633306138633832
+66386139666232303361616634653539393763383733633136396263663132666461376535346366
+61623465373432353065313265366531306264366637373930623732356565636262386435656666
+64643431383835646233333434363136636536363863633533663964323432373230626162643762
+35636636613538646438383731666238363434616435396232653136356531316639353832306563
+66393930376631313735346231356235663364623664313334636463643737343537323234326132
+30313031623662396130653761356365306333303935353331393261383664326435353937303934
+32336235333237373830396130656164346136323466646130653365333833616336643563323964
+61636135396263366237366263373138653730316139303566653065333666353164643134393231
+35666233316362363636306563323538376137363063306565663236393735626533613764346630
+64363666656536346432363831326139316166363635653966343666626135363034373935303535
+30643362353134663237363734646238623261353134356266383730303163343363646662343436
+35626563623362323336653537326336306230626233343337346538626666326462396632633538
+34656335383564363135663866623064393535636162373031393937313834393232333136396334
+65623939353632376337646631313933376266633530636637373039333966643135363566343435
+39336637313331313034383533633434383232656365396363373336623562373964356532396232
+38393430363139613438346166643430633661653630363861646539373534666438626633643934
+30386365376139383837336362663335336366346265353536323764393637623332383938333437
+30386637646466386230393939316163636362323364353232326439356164383861616362383964
+61343063376363663631386362333638663732303436616337326263333631363035333062663239
+36396538633634613363313932383233383339353064343131343337356336393739616564653238
+6561386361623837336461333035373735643233653661346566
diff --git a/ansible/templates/pxe/telegraf-cvmfs-listener.conf.j2 b/ansible/templates/pxe/telegraf-cvmfs-listener.conf.j2
new file mode 100644
index 00000000..128ab72b
--- /dev/null
+++ b/ansible/templates/pxe/telegraf-cvmfs-listener.conf.j2
@@ -0,0 +1,3 @@
+[[inputs.socket_listener]]
+  service_address = "udp://:8092"
+  data_format = "influx"
diff --git a/ansible/workers.yml b/ansible/workers.yml
new file mode 100644
index 00000000..335d33b0
--- /dev/null
+++ b/ansible/workers.yml
@@ -0,0 +1,150 @@
+---
+- hosts: workers
+  vars_files:
+    - "group_vars/pulsar.yml"
+  pre_tasks:
+    - name: Ensure `gnupg2` is installed
+      # required for repository management,
+      # in this playbook precisely by `geerlingguy.docker`
+      ansible.builtin.package:
+        name:
+          - gnupg2
+        state: present
+      when: ansible_distribution_major_version|int >= 10
+    - name: Debug Kernel version
+      ansible.builtin.shell:
+        cmd: uname -r
+      register: kernel
+    - name: Print kernel version
+      ansible.builtin.debug:
+        msg: "{{ kernel }}"
+    - name: Install Pulsar dependencies
+      ansible.builtin.package:
+        name:
+          - gcc
+          - curl
+          - git
+          - libcurl-devel
+          - python-devel
+        state: present
+      become: true
+      when: ansible_os_family == 'RedHat' and ansible_distribution_major_version | int >= 9
+    - name: Set default version of Python
+      ansible.builtin.alternatives:
+        name: python
+        path: /usr/bin/python3
+        link: /usr/bin/python
+    - name: Put SELinux in permissive mode, logging actions that would be blocked.
+      ansible.builtin.lineinfile:
+        path: /etc/selinux/config
+        regexp: '^SELINUX='
+        line: SELINUX=permissive
+    # CHECK IF THIS IS NEEDED OR EXECUTED
+    - name: "Deploy docker-stop-1M script"
+      ansible.builtin.copy:
+        content: |
+            #!/bin/bash
+            docker ps -f status=running --format '{{ '{{' }}.ID}}: {{ '{{' }}.RunningFor}}' | awk '/months/ && $2 > 1 { print $0 }'|cut -f1 -d':' | xargs docker stop
+        dest: /usr/bin/docker-stop-1M
+        owner: root
+        group: root
+        mode: 0755
+    - name: Ensure the HTCondor configuration directory exists.
+      become: true
+      ansible.builtin.file:
+        path: /etc/condor
+        state: directory
+        owner: root
+        group: root
+        mode: "0755"
+    - name: Condor walltime script
+      ansible.builtin.copy:
+        dest: /etc/condor/meta_walltime.py
+        src: meta_walltime.py
+        mode: "0755"
+    - name: Create Staponpriv user homedir, see issue 23
+      become: true
+      ansible.builtin.file:
+        path: /var/lib/stapunpriv
+        state: directory
+        owner: root
+        group: root
+  post_tasks:
+    - name: Add firewall rules for NFS
+      ansible.posix.firewalld:
+        service: "{{ item }}"
+        state: enabled
+        permanent: true
+        immediate: true
+      with_items:
+        - nfs
+        - rpc-bind
+        - mountd
+    - name: Restart Autofs
+      ansible.builtin.service:
+        name: autofs
+        state: restarted
+    - name: Post Task Create User and add galaxy and condor/docker user groups
+      ansible.builtin.user:
+        name: galaxy
+        groups: condor,docker
+        append: yes
+        #  Let's keep this here as a reminder that uninstalling something
+        #  because we think it MAY not be needed, can result in several hours
+        #  debugging. This task removed the nvidia driver and cuda.
+        #  - ansible.builtin.dnf:
+        #      name: "{{ packages }}"
+        #      state: absent
+        #    vars:
+        #      packages:
+        #        - libcurl-devel
+        #        - openssl-devel
+        #    become: yes
+    - name: Ensure Docker directory extists
+      file:
+        state: directory
+        path: /etc/docker
+        mode: '0755'
+    - name: Copy Docker daemon.json
+      ansible.builtin.copy:
+        src: daemon.json
+        dest: /etc/docker/daemon.json
+        mode: '0644'
+    - name: Restart Docker service, in all cases
+      ansible.builtin.service:
+        name: docker
+        state: restarted
+    - name: Deploy a signal emitter for telegraf
+      ansible.builtin.copy:
+        content: |
+          #!/bin/bash
+          echo '{"alive":1}'
+        dest: /bin/iamalive
+        owner: telegraf
+        group: telegraf
+        mode: 0755
+  roles:
+    - role: usegalaxy_eu.handy.os_setup
+      vars:
+        enable_pam_limits: true
+        enable_journald: true
+        enable_ansible_root_cron: true
+
+    - usegalaxy-eu.autofs
+
+    - geerlingguy.docker
+
+    - galaxyproject.cvmfs
+    - galaxyproject.pulsar
+    - usegalaxy_eu.cuda
+    - usegalaxy_eu.nvidia_container
+
+    - usegalaxy-eu.logrotate
+
+    # Applies a 250GB soft and 1TB hard limit on the file size for the condor systemd unit
+    - role: usegalaxy-eu.fslimit
+      become: yes
+      vars:
+        ulimit_fsize_unit: "condor.service"
+        ulimit_fsize_soft: 268435456000
+        ulimit_fsize_hard: 1073741824000
diff --git a/base.json b/base.json
deleted file mode 100644
index 69486fe3..00000000
--- a/base.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "cpus": "2",
-  "boot_wait": "15s",
-  "disk_size": "6000",
-  "headless": "true",
-  "memory": "2048",
-  "ssh_timeout": "600m",
-  "ssh_username": "root"
-}
diff --git a/boot_files/.keep_dir b/boot_files/.keep_dir
new file mode 100644
index 00000000..e69de29b
diff --git a/build.py b/build.py
new file mode 100755
index 00000000..ba121874
--- /dev/null
+++ b/build.py
@@ -0,0 +1,478 @@
+#!/usr/bin/env python
+# A command line script that builds a VGCN image with Packer.
+# CAUTION: If a directory called 'images' exists in this directory, it will be deleted!
+# Required arguments are a Packer build (builds are defined in templates/build.pkr.hcl)
+# and the provisioning Ansible playbooks (located in the ansible directory, passed
+# without the .yml suffix).
+# Optionally you can specify the path to the Packer binary you want to use (--packer-path)
+# the path to the conda env you want to use (--conda-env)
+# the path to your ssh private key for copying the images to sn06 and
+# make them publicly available (--publish)
+# you can also source your OpenStack application credentials first and set the (`--openstack`) flag
+# to create a raw image in your openstack tenant
+# If you have trouble with the ansible provider on your setup, you can specify additional
+# --ansible-args="..." to e.g. solve the issues with scp on some distros
+
+
+import argparse
+import contextlib
+import datetime
+import os
+import pathlib
+import shutil
+import signal
+import subprocess
+import sys
+import threading
+import time
+
+DIR_PATH = pathlib.Path(__file__).parent.absolute()
+
+STATIC_DIR = pathlib.Path("/data/dnb01/vgcn/").absolute()
+
+SSH_HOST = "sn06.galaxyproject.eu"
+
+SSH_USER = "root"
+
+
+def make_parser() -> argparse.ArgumentParser:
+    my_parser = argparse.ArgumentParser(
+        prog="build",
+        description="Build a VGCN image with Packer and the Ansible provisioner",
+    )
+
+    my_parser.add_argument(
+        "image",
+        help="image help",
+    )
+    my_parser.add_argument(
+        "provisioning",
+        choices=[
+            x.split(".", 1)[0] for x in os.listdir("ansible") if x.endswith(".yml")
+        ],
+        help="""
+        The playbooks you want to provision.
+        The playbook files are located in the ansible folder
+        and are automatically detected by this script, the options are the filenames, without .yml suffix
+        """,
+        nargs="+",
+    )
+    my_parser.add_argument(
+        "delivery",
+        choices=["no","kvm", "pxe", "cloud"],
+        help="Delivery method playbook to run (kvm, pxe, or cloud)",
+    )
+    my_parser.add_argument(
+        "--ansible-args",
+        type=str,
+        help='e.g. --ansible-args="--scp-extra-args=-O" which activates SCP compatibility mode and might be needed on Fedora',
+    )
+    my_parser.add_argument(
+        "--openstack",
+        action="store_true",
+        help="Create an image in your OpenStack tenant and upload it. Make sure to source your credentials first",
+    )
+    my_parser.add_argument(
+        "--publish",
+        type=pathlib.Path,
+        metavar="PVT_KEY",
+        help="specify the path to your ssh key for sn06",
+    )
+    my_parser.add_argument(
+        "--dry-run",
+        action="store_true",
+        help="just print the commands without executing anything",
+    )
+    my_parser.add_argument(
+        "--conda-env",
+        type=pathlib.Path,
+        help="specifies the path to  the conda environment to use",
+    )
+    my_parser.add_argument(
+        "--comment", type=str, help="add a comment to the image name"
+    )
+    my_parser.add_argument(
+        "-q",
+        "--quiet",
+        action="store_true",
+        help="Don't use the spinner, but still print logs.",
+    )
+
+    return my_parser
+
+
+# Spinner class from https://stackoverflow.com/a/39504463 by Victor Moyseenko, subject to CC BY-SA 4.0 license.
+class Spinner:
+    """
+    Creates a spinning cursor while the command runs.
+    Indicates the user that the screen did not freeze or similar.
+    Especially useful during the image upload, which can take several minutes.
+    """
+
+    busy = False
+    delay = 0.1
+
+    @staticmethod
+    def spinning_cursor():
+        while 1:
+            for cursor in "|/-\\":
+                yield cursor
+
+    def __init__(self, delay=None):
+        self.spinner_generator = self.spinning_cursor()
+        if delay and float(delay):
+            self.delay = delay
+
+    def spinner_task(self):
+        while self.busy:
+            sys.stdout.write(next(self.spinner_generator))
+            sys.stdout.flush()
+            time.sleep(self.delay)
+            sys.stdout.write("\b")
+            sys.stdout.flush()
+
+    def __enter__(self):
+        self.busy = True
+        threading.Thread(target=self.spinner_task).start()
+
+    def __exit__(self, exception, value, tb):
+        self.busy = False
+        time.sleep(self.delay)
+        if exception is not None:
+            return False
+
+
+def run_subprocess_with_spinner(name: str, proc: subprocess.Popen, show_spinner: bool):
+    """
+    Opens a subprocess and redirect stdout and stderr to Python.
+    Shows a spinning Cursor while the command runs.
+    Exits with returncode of subprocess if not equals 0.
+    """
+
+    try:
+        p = None
+        # Register handler to pass keyboard interrupt to the subprocess
+
+        def handler(sig, frame):
+            print(f"================= {name} ABORTED BY USER ====================")
+            if p:
+                p.send_signal(signal.SIGINT)
+            else:
+                raise KeyboardInterrupt.add_note()
+
+        signal.signal(signal.SIGINT, handler)
+        context_mgr = Spinner() if show_spinner else contextlib.suppress()
+        with context_mgr:
+            print(f"{name.rstrip('Ee')}ing...")
+            with proc as p:
+                for line in iter(p.stdout.readline, b""):
+                    # Print the line to the console
+                    sys.stdout.buffer.write(line)
+                for line in iter(p.stderr.readline, b""):
+                    # Print the error output to the console
+                    sys.stderr.buffer.write(line)
+                returncode = p.wait()
+                if returncode:
+                    print(
+                        f"===================== {name} FAILED ========================="
+                    )
+                    sys.exit(returncode)
+                else:
+                    print(
+                        f"===================== {name} SUCCESSFUL ====================="
+                    )
+    finally:
+        signal.signal(signal.SIGINT, signal.SIG_DFL)
+
+
+class Build:
+    def __init__(
+        self,
+        openstack: bool,
+        template: str,
+        conda_env: pathlib.Path,
+        provisioning: [str],
+        delivery: str,
+        comment: str,
+        pvt_key: pathlib.Path,
+        ansible_args: str,
+        show_spinner: bool,
+    ):
+        self.openstack = openstack
+        self.template = template
+        self.comment = comment
+        self.pvt_key = pvt_key
+        self.provisioning = provisioning
+        # Manage mutually exclusive delivery methods
+        for d in ["kvm", "pxe", "cloud"]:
+            if d in self.provisioning and d != delivery:
+                self.provisioning.remove(d)
+        if delivery not in self.provisioning:
+            self.provisioning.append(delivery)
+        self.ansible_args = ansible_args
+        self.image_name = self.assemble_name()
+        self.image_path = DIR_PATH / f"{self.image_name}.raw"
+        self.show_spinner = show_spinner
+        if conda_env and conda_env.exists():
+            self.qemu_path = f"{conda_env}/bin/qemu-img"
+            self.openstack_path = f"{conda_env}/bin/openstack"
+            self.packer_path = f"{conda_env}/bin/packer"
+        else:
+            self.packer_path = shutil.which("packer")
+            self.openstack_path = shutil.which("openstack")
+            self.qemu_path = shutil.which("qemu-img")
+
+    def dry_run(self):
+        print(self.assemble_packer_envs())
+        print(self.assemble_packer_build_command())
+        print(self.image_name)
+        print(self.assemble_convert_command())
+        if self.openstack:
+            print(self.assemble_os_command())
+        if self.pvt_key:
+            print(self.assemble_scp_command())
+            print(self.assemble_ssh_command())
+
+    def assemble_packer_init_command(self):
+        return " ".join(
+            [
+                f"{self.packer_path}",
+                f"init",
+                f"{DIR_PATH / 'templates'}",
+            ]
+        )
+
+    def assemble_packer_build_command(self):
+        return " ".join(
+            [
+                f"{self.packer_path}",
+                f"build",
+                f"-only=qemu.{self.template}",
+                f"{DIR_PATH / 'templates'}",
+            ]
+        )
+
+    def assemble_convert_command(self):
+        return " ".join(
+            [
+                f"{self.qemu_path}",
+                f"convert",
+                f"-O",
+                f"raw",
+                f"./images/{self.template}",
+                f"{self.image_path}",
+            ]
+        )
+
+    def assemble_os_command(self):
+        return " ".join(
+            [
+                f"{self.openstack_path}",
+                f"image",
+                f"create",
+                f"--file",
+                f"{self.image_path}",
+                f"{self.image_name}",
+            ]
+        )
+
+    def assemble_packer_envs(self):
+        env = os.environ.copy()
+        env["PACKER_PLUGIN_PATH"] = f"{DIR_PATH}/packer_plugins"
+        env["PKR_VAR_groups"] = (
+            f"""[{','.join('"' + x + '"' for x in self.provisioning)}]"""
+        )
+        env["PKR_VAR_headless"] = "true"
+        env["PKR_VAR_image_name"] = f"{self.image_name}"
+        if self.ansible_args:
+            env["PKR_VAR_ansible_extra_args"] = self.ansible_args
+        return env
+
+    def assemble_name(self):
+        """
+        Uses a naming scheme described in
+        https://github.com/usegalaxy-eu/vgcn/issues/78
+        """
+        provisioning = self.provisioning.copy()
+        if "generic" not in self.provisioning:
+            provisioning.insert(0, "!generic")
+        name = [
+            "vgcn",
+            self.template,
+            f"+{'+'.join(provisioning)}",
+            self.assemble_timestamp(),
+            subprocess.check_output(["git", "rev-parse", "--abbrev-ref", "HEAD"])
+            .decode("ascii")
+            .strip()
+            .replace("/", "-"),
+            subprocess.check_output(["git", "rev-parse", "--short", "HEAD"])
+            .decode("ascii")
+            .strip(),
+        ]
+        if self.comment:
+            name += [self.comment]
+        return "~".join(name)
+
+    def assemble_scp_command(self):
+        return " ".join(
+            [
+                f"scp",
+                f"-i",
+                f"{self.pvt_key}",
+                f"{self.image_path}",
+                f"{SSH_USER}@{SSH_HOST}:{STATIC_DIR / self.image_name}",
+            ]
+        )
+
+    def assemble_ssh_command(self):
+        return " ".join(
+            [
+                f"ssh",
+                f"-i",
+                f"{self.pvt_key}",
+                f"{SSH_USER}@{SSH_HOST}",
+                f"chmod",
+                f"ugo+r",
+                f"{STATIC_DIR / self.image_name}",
+            ]
+        )
+
+    def assemble_timestamp(self):
+        commit_time = (
+            subprocess.check_output(["git", "show", "--no-patch", "--format=%ct"])
+            .decode("ascii")
+            .strip()
+        )
+        commit_time = int(commit_time)
+        commit_time = datetime.datetime.fromtimestamp(commit_time)
+
+        commit_date = commit_time.date()
+        commit_date_midnight = datetime.datetime(
+            commit_date.year, commit_time.month, commit_time.day
+        )
+
+        seconds_since_midnight = int(
+            (commit_time - commit_date_midnight).total_seconds()
+        )
+
+        return f"{commit_time.date().strftime('%Y%m%d')}" f"~{seconds_since_midnight}"
+
+    def build(self):
+        self.clean_image_dir()
+        run_subprocess_with_spinner(
+            "INITIALIZE",
+            subprocess.Popen(
+                self.assemble_packer_init_command(),
+                env=self.assemble_packer_envs(),
+                stdout=subprocess.PIPE,
+                stderr=subprocess.PIPE,
+                close_fds=True,
+                shell=True,
+            ),
+            show_spinner=self.show_spinner,
+        )
+        run_subprocess_with_spinner(
+            "BUILD",
+            subprocess.Popen(
+                self.assemble_packer_build_command(),
+                env=self.assemble_packer_envs(),
+                stdout=subprocess.PIPE,
+                stderr=subprocess.PIPE,
+                close_fds=True,
+                shell=True,
+            ),
+            show_spinner=self.show_spinner,
+        )
+
+    def convert(self):
+        run_subprocess_with_spinner(
+            name="CONVERT",
+            proc=subprocess.Popen(
+                self.assemble_convert_command(),
+                stdout=subprocess.PIPE,
+                stderr=subprocess.PIPE,
+                close_fds=True,
+                shell=True,
+            ),
+            show_spinner=self.show_spinner,
+        )
+
+    def clean_image_dir(self):
+        if (DIR_PATH / "images").exists():
+            shutil.rmtree(DIR_PATH / "images")
+
+    def upload_to_OS(self):
+        # Checking this, because OS is failing silently
+        env = os.environ.copy()
+        if not (
+            "OS_AUTH_URL" in env
+            and "OS_APPLICATION_CREDENTIAL_ID" in env
+            and "OS_APPLICATION_CREDENTIAL_SECRET" in env
+        ):
+            print("OS credentials missing in environment vars")
+            sys.exit(1)
+        run_subprocess_with_spinner(
+            "OPENSTACK IMAGE CREATE",
+            subprocess.Popen(
+                self.assemble_os_command(),
+                env=env,
+                stdout=subprocess.PIPE,
+                stderr=subprocess.PIPE,
+                close_fds=True,
+                shell=True,
+            ),
+            show_spinner=self.show_spinner,
+        )
+
+    def publish(self):
+        run_subprocess_with_spinner(
+            "PUBLISH",
+            subprocess.Popen(
+                self.assemble_scp_command(),
+                stdout=subprocess.PIPE,
+                stderr=subprocess.PIPE,
+                close_fds=True,
+                shell=True,
+            ),
+            show_spinner=self.show_spinner,
+        )
+        run_subprocess_with_spinner(
+            "PERMISSION CHANGE",
+            subprocess.Popen(
+                self.assemble_ssh_command(),
+                stdout=subprocess.PIPE,
+                stderr=subprocess.PIPE,
+                close_fds=True,
+                shell=True,
+            ),
+            show_spinner=self.show_spinner,
+        )
+
+
+def main():
+    my_parser = make_parser()
+    args = my_parser.parse_args()
+    image = Build(
+        openstack=args.openstack,
+        template=args.image,
+        conda_env=args.conda_env,
+        provisioning=args.provisioning,
+        delivery=args.delivery,
+        comment=args.comment,
+        ansible_args=args.ansible_args,
+        pvt_key=args.publish,
+        show_spinner=not args.quiet,
+    )
+    if args.dry_run:
+        image.dry_run()
+    else:
+        image.build()
+        image.convert()
+        if args.openstack:
+            image.upload_to_OS()
+        if args.publish:
+            image.publish()
+
+
+if __name__ == "__main__":
+    main()
diff --git a/centos-7.x-x86_64.json b/centos-7.x-x86_64.json
deleted file mode 100644
index 49ad9b6a..00000000
--- a/centos-7.x-x86_64.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-	"variables": {
-		"iso_url": "http://mirror1.hs-esslingen.de/pub/Mirrors/centos/7/isos/x86_64/CentOS-7-x86_64-NetInstall-2003.iso",
-		"iso_checksum": "101bc813d2af9ccf534d112cbe8670e6d900425b297d1a4d2529c5ad5f226372",
-		"iso_checksum_url": "http://mirror1.hs-esslingen.de/pub/Mirrors/centos/7/isos/x86_64/sha256sum.txt", 
-		"iso_checksum_type": "sha256",
-		"vm_name": "centos-7.x-x86_64",
-		"http_dir": "http",
-		"kickstart_path": "centos-7.x/anaconda-ks.cfg",
-		"shutdown_command": "systemctl poweroff",
-		"ssh_password": "password"
-	},
-	"builders": [{
-		"type": "qemu",
-		"accelerator": "kvm",
-		"iso_url": "{{ user `iso_url` }}",
-		"iso_checksum": "{{ user `iso_checksum` }}",
-		"iso_checksum_type": "{{ user `iso_checksum_type` }}",
-		"output_directory": "output-{{ user `vm_name` }}-{{ build_type }}",
-		"vm_name": "{{ user `vm_name` }}",
-		"format": "qcow2",
-		"disk_size": "{{ user `disk_size` }}",
-		"net_device": "virtio-net",
-		"disk_interface": "virtio",
-		"headless": "{{ user `headless` }}",
-		"http_directory": "{{ user `http_dir` }}",
-		"boot_command": [
-			"<esc><wait>",
-			"linux inst.mbr biosdevname=0 net.ifnames=0 ",
-			"rootpw={{ user `ssh_password` }} ",
-			"inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{ user `kickstart_path` }}",
-			"<enter>"
-		],
-		"boot_wait": "{{ user `boot_wait` }}",
-		"ssh_timeout": "{{ user `ssh_timeout` }}",
-		"ssh_username": "{{ user `ssh_username` }}",
-		"ssh_password": "{{ user `ssh_password` }}",
-		"shutdown_command": "{{ user `shutdown_command` }}",
-		"qemuargs": [
-			["-m", "{{ user `memory` }}"],
-			["-smp", "{{ user `cpus` }}"]
-		]
-	}],
-	"post-processors": [{
-		"type": "manifest",
-		"output": "output-{{ user `vm_name` }}-{{ build_type }}/manifest.json"
-	}]
-}
diff --git a/centos-8.x-x86_64.json b/centos-8.x-x86_64.json
deleted file mode 100644
index cdb418a0..00000000
--- a/centos-8.x-x86_64.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-	"variables": {
-		"iso_url": "https://vault.centos.org/8.5.2111/isos/x86_64/CentOS-8.5.2111-x86_64-boot.iso",
-		"iso_checksum": "9602c69c52d93f51295c0199af395ca0edbe35e36506e32b8e749ce6c8f5b60a",
-		"iso_checksum_url": "https://vault.centos.org/8.5.2111/isos/x86_64/CHECKSUM",
-		"iso_checksum_type": "sha256",
-		"vm_name": "centos-8.x-x86_64",
-		"http_dir": "http",
-		"kickstart_path": "centos-8.x/anaconda-ks.cfg",
-		"shutdown_command": "systemctl poweroff",
-		"ssh_password": "password"
-	},
-	"builders": [{
-		"type": "qemu",
-		"accelerator": "kvm",
-		"iso_url": "{{ user `iso_url` }}",
-		"iso_checksum": "{{ user `iso_checksum` }}",
-		"iso_checksum_type": "{{ user `iso_checksum_type` }}",
-		"output_directory": "output-{{ user `vm_name` }}-{{ build_type }}",
-		"vm_name": "{{ user `vm_name` }}",
-		"format": "qcow2",
-		"disk_size": "{{ user `disk_size` }}",
-		"net_device": "virtio-net",
-		"disk_interface": "virtio",
-		"headless": "{{ user `headless` }}",
-		"http_directory": "{{ user `http_dir` }}",
-		"boot_command": [
-			"<esc><wait>",
-			"linux inst.mbr biosdevname=0 net.ifnames=0 ",
-			"rootpw={{ user `ssh_password` }} ",
-			"inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{ user `kickstart_path` }}",
-			"<enter>"
-		],
-		"boot_wait": "{{ user `boot_wait` }}",
-		"ssh_timeout": "{{ user `ssh_timeout` }}",
-		"ssh_username": "{{ user `ssh_username` }}",
-		"ssh_password": "{{ user `ssh_password` }}",
-		"shutdown_command": "{{ user `shutdown_command` }}",
-		"qemuargs": [
-			["-m", "{{ user `memory` }}"],
-			["-smp", "{{ user `cpus` }}"]
-		]
-	}],
-	"post-processors": [{
-		"type": "manifest",
-		"output": "output-{{ user `vm_name` }}-{{ build_type }}/manifest.json"
-	}]
-}
diff --git a/environment.yml b/environment.yml
new file mode 100644
index 00000000..09cb6045
--- /dev/null
+++ b/environment.yml
@@ -0,0 +1,111 @@
+name: vgcn-build
+channels:
+  - tsnyder
+  - conda-forge
+dependencies:
+  - _libgcc_mutex=0.1=conda_forge
+  - _openmp_mutex=4.5=2_gnu
+  - ansible=8.5.0=pyhd8ed1ab_0
+  - ansible-core=2.15.4=pyh707e725_0
+  - appdirs=1.4.4=pyh9f0ad1d_0
+  - attrs=23.1.0=pyh71513ae_1
+  - autopage=0.5.2=pyhd8ed1ab_0
+  - brotlipy=0.7.0=py312h98912ed_1006
+  - bzip2=1.0.8=hd590300_5
+  - c-ares=1.23.0=hd590300_0
+  - ca-certificates=2023.11.17=hbcca054_0
+  - certifi=2023.11.17=pyhd8ed1ab_0
+  - cffi=1.16.0=py312hf06ca03_0
+  - charset-normalizer=3.3.2=pyhd8ed1ab_0
+  - cliff=4.4.0=pyhd8ed1ab_0
+  - cmd2=2.4.3=py312h7900ff3_1
+  - cryptography=41.0.7=py312h4742d6a_1
+  - debtcollector=2.5.0=pyhd8ed1ab_0
+  - decorator=5.1.1=pyhd8ed1ab_0
+  - dogpile.cache=1.2.2=pyhd8ed1ab_1
+  - gettext=0.21.1=h27087fc_0
+  - idna=3.6=pyhd8ed1ab_0
+  - importlib-metadata=7.0.0=pyha770c72_0
+  - importlib_metadata=7.0.0=hd8ed1ab_0
+  - iso8601=2.1.0=pyhd8ed1ab_0
+  - jinja2=3.1.2=pyhd8ed1ab_1
+  - jmespath=1.0.1=pyhd8ed1ab_0
+  - jsonpatch=1.33=pyhd8ed1ab_0
+  - jsonpointer=2.4=py312h7900ff3_3
+  - keystoneauth1=5.4.0=pyhd8ed1ab_0
+  - krb5=1.20.1=h143b758_1
+  - ld_impl_linux-64=2.40=h41732ed_0
+  - libcurl=7.88.1=hdc1c0ab_1
+  - libedit=3.1.20221030=h5eee18b_0
+  - libev=4.33=hd590300_2
+  - libexpat=2.5.0=hcb278e6_1
+  - libffi=3.4.2=h7f98852_5
+  - libgcc-ng=13.2.0=h807b86a_3
+  - libglib=2.70.2=h174f98d_4
+  - libgomp=13.2.0=h807b86a_3
+  - libiconv=1.17=hd590300_1
+  - libnghttp2=1.57.0=h2d74bed_0
+  - libnsl=2.0.1=hd590300_0
+  - libsqlite=3.44.2=h2797004_0
+  - libssh2=1.11.0=h0841786_0
+  - libstdcxx-ng=11.2.0=h1234567_1
+  - libuuid=2.38.1=h0b41bf4_0
+  - libzlib=1.2.13=hd590300_5
+  - lz4-c=1.9.3=h9c3ff4c_1
+  - markupsafe=2.1.3=py312h98912ed_1
+  - msgpack-python=1.0.3=py312hdb19cb5_0
+  - ncurses=6.4=h59595ed_2
+  - netaddr=0.7.19=py_0
+  - netifaces=0.11.0=py312h98912ed_2
+  - openssl=3.2.0=hd590300_1
+  - openstacksdk=2.0.0=pyhd8ed1ab_0
+  - os-service-types=1.7.0=pyh9f0ad1d_0
+  - osc-lib=2.9.0=pyhd8ed1ab_0
+  - oslo.config=9.2.0=pyhd8ed1ab_0
+  - oslo.i18n=6.2.0=pyhd8ed1ab_0
+  - oslo.serialization=5.2.0=pyhd8ed1ab_0
+  - oslo.utils=6.3.0=pyhd8ed1ab_0
+  - packaging=23.2=pyhd8ed1ab_0
+  - packer=1.10.0=ha8f183a_0
+  - pbr=6.0.0=pyhd8ed1ab_0
+  - pcre=8.45=h9c3ff4c_0
+  - pip=23.3.1=pyhd8ed1ab_0
+  - pixman=0.40.0=h36c2ea0_0
+  - platformdirs=4.1.0=pyhd8ed1ab_0
+  - prettytable=3.9.0=pyhd8ed1ab_0
+  - pycparser=2.21=pyhd8ed1ab_0
+  - pyopenssl=23.3.0=pyhd8ed1ab_0
+  - pyparsing=3.1.1=pyhd8ed1ab_0
+  - pyperclip=1.8.2=pyhd8ed1ab_2
+  - pysocks=1.7.1=pyha2e5f31_6
+  - python=3.12.0=hab00c5b_0_cpython
+  - python-cinderclient=9.4.0=pyhd8ed1ab_0
+  - python-keystoneclient=5.2.0=pyhd8ed1ab_0
+  - python-novaclient=18.3.0=pyhd8ed1ab_0
+  - python-openstackclient=6.3.0=pyhd8ed1ab_0
+  - python-tzdata=2023.3=pyhd8ed1ab_0
+  - python_abi=3.12=4_cp312
+  - pytz=2023.3.post1=pyhd8ed1ab_0
+  - pyyaml=6.0.1=py312h98912ed_1
+  - qemu=5.0.0=hc4641f2_0
+  - readline=8.2=h8228510_1
+  - requests=2.31.0=pyhd8ed1ab_0
+  - requestsexceptions=1.4.0=py_0
+  - resolvelib=1.0.1=pyhd8ed1ab_0
+  - rfc3986=2.0.0=pyhd8ed1ab_0
+  - setuptools=68.2.2=pyhd8ed1ab_0
+  - simplejson=3.19.2=py312h98912ed_0
+  - six=1.16.0=pyh6c4a22f_0
+  - stevedore=5.1.0=pyhd8ed1ab_0
+  - tk=8.6.13=noxft_h4845f30_101
+  - typing_extensions=4.9.0=pyha770c72_0
+  - tzdata=2023c=h71feb2d_0
+  - urllib3=1.26.15=pyhd8ed1ab_0
+  - wcwidth=0.2.12=pyhd8ed1ab_0
+  - wheel=0.42.0=pyhd8ed1ab_0
+  - wrapt=1.16.0=py312h98912ed_0
+  - xz=5.2.6=h166bdaf_0
+  - yaml=0.2.5=h7f98852_2
+  - zipp=3.17.0=pyhd8ed1ab_0
+  - zlib=1.2.13=hd590300_5
+  - zstd=1.5.2=h8a70e8d_1
diff --git a/http/centos-7.x/anaconda-ks.cfg b/http/centos-7.x/anaconda-ks.cfg
deleted file mode 100644
index 7978dee5..00000000
--- a/http/centos-7.x/anaconda-ks.cfg
+++ /dev/null
@@ -1,55 +0,0 @@
-install
-text
-reboot
-url --mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=os
-lang en_US.UTF-8
-keyboard --vckeymap=us --xlayouts='us'
-timezone Europe/Berlin --isUtc --nontp
-auth --enableshadow --passalgo=sha512
-clearpart --none --initlabel
-bootloader --location=mbr --boot-drive=vda
-part biosboot --fstype="biosboot" --ondisk=vda --size=1
-part / --fstype="xfs" --ondisk=vda --grow --label=system
-
-%packages
-@^minimal
-@core
-kexec-tools
-%end
-
-# small python script to extract the password from the kernel command line
-# expects the password given as: rootpw=<password>
-%pre --interpreter=/usr/bin/python
-import shlex, crypt
-arg = 'rootpw='
-with open('/proc/cmdline', 'r') as f:
-  kcl = f.read().split()
-# extract the password
-passwords = [x[len(arg):] for x in kcl if x.startswith(arg)]
-if len(passwords) == 1:
-  kclpass = passwords[0]
-# TODO sane fallbacks. This should work most of the time though :)
-# generate SHA512 hash
-hash = crypt.crypt(kclpass, crypt.mksalt(crypt.METHOD_SHA512))
-with open('/tmp/setup-root-pass', 'w') as f:
-  f.write('rootpw --iscrypted ' + hash)
-%end
-# include the created password file
-%include /tmp/setup-root-pass
-
-%post --erroronfail
-yum -y update
-yum -y install wget
-yum -y install epel-release
-yum -y install ansible
-# allow root login for ansible
-sed 's,^[[:blank:]]*#*PermitRootLogin.*,PermitRootLogin yes,g' /etc/ssh/sshd_config
-
-ln -s /dev/null /etc/udev/rules.d/80-net-name-slot.rules
-cat > /etc/sysconfig/network-scripts/ifcfg-eth0 <<EOF
-DEVICE="eth0"
-BOOTPROTO="dhcp"
-ONBOOT="yes"
-TYPE="Ethernet"
-EOF
-%end
diff --git a/http/rockylinux-8.x/anaconda-ks.cfg b/http/rockylinux-8.x/anaconda-ks.cfg
deleted file mode 100644
index 795d67b0..00000000
--- a/http/rockylinux-8.x/anaconda-ks.cfg
+++ /dev/null
@@ -1,54 +0,0 @@
-install
-text
-reboot
-url --url=https://ftp.fau.de/rockylinux/8/BaseOS/x86_64/os/
-lang en_US.UTF-8
-keyboard --vckeymap=us --xlayouts='us'
-timezone Europe/Berlin --isUtc --nontp
-clearpart --none --initlabel
-bootloader --location=mbr --boot-drive=vda
-part biosboot --fstype="biosboot" --ondisk=vda --size=1
-part / --fstype="xfs" --ondisk=vda --grow --label=system
-
-%packages
-@core
-@^minimal install
-kexec-tools
-%end
-
-# small python script to extract the password from the kernel command line
-# expects the password given as: rootpw=<password>
-%pre --interpreter=/usr/libexec/platform-python
-import shlex, crypt
-arg = 'rootpw='
-with open('/proc/cmdline', 'r') as f:
-  kcl = f.read().split()
-# extract the password
-passwords = [x[len(arg):] for x in kcl if x.startswith(arg)]
-if len(passwords) == 1:
-  kclpass = passwords[0]
-# TODO sane fallbacks. This should work most of the time though :)
-# generate SHA512 hash
-hash = crypt.crypt(kclpass, crypt.mksalt(crypt.METHOD_SHA512))
-with open('/tmp/setup-root-pass', 'w') as f:
-  f.write('rootpw --iscrypted ' + hash)
-%end
-# include the created password file
-%include /tmp/setup-root-pass
-
-%post --erroronfail
-yum -y update
-yum -y install wget
-yum -y install epel-release
-yum -y install ansible
-# allow root login for ansible
-sed 's,^[[:blank:]]*#*PermitRootLogin.*,PermitRootLogin yes,g' /etc/ssh/sshd_config
-
-ln -s /dev/null /etc/udev/rules.d/80-net-name-slot.rules
-cat > /etc/sysconfig/network-scripts/ifcfg-eth0 <<EOF
-DEVICE="eth0"
-BOOTPROTO="dhcp"
-ONBOOT="yes"
-TYPE="Ethernet"
-EOF
-%end
diff --git a/http/sl-6.9/anaconda-ks.cfg b/http/sl-6.9/anaconda-ks.cfg
deleted file mode 100644
index 824da44a..00000000
--- a/http/sl-6.9/anaconda-ks.cfg
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-install
-url --url=http://ftp1.scientificlinux.org/linux/scientific/6.9/x86_64/os/
-lang en_US.UTF-8
-keyboard us
-network --activate --bootproto=dhcp --device=eth0 --onboot=on --ipv6=auto
-# small python script to extract the password from the kernel command line
-# expects the password given as: rootpw=<password>
-%pre --interpreter=/usr/bin/python
-import shlex, crypt
-arg = 'rootpw='
-with open('/proc/cmdline', 'r') as f:
-  kcl = f.read().split()
-# extract the password
-passwords = [x[len(arg):] for x in kcl if x.startswith(arg)]
-if len(passwords) == 1:
-  kclpass = passwords[0]
-# TODO sane fallbacks. This should work most of the time though :)
-# generate SHA512 hash
-hash = crypt.crypt(kclpass, crypt.mksalt(crypt.METHOD_SHA512))
-with open('/tmp/setup-root-pass', 'w') as f:
-  f.write('rootpw --iscrypted ' + hash)
-%end
-# include the created password file
-%include /tmp/setup-root-pass
-#
-services --enabled ssh
-#
-reboot
-firewall --disabled
-authconfig --enableshadow --passalgo=sha512
-selinux --disabled
-timezone --utc Europe/Berlin
-bootloader --append=" sshd=1" --location=mbr --driveorder=sda
-#
-#autopart --type=plain --fstype=ext4
-zerombr
-clearpart --drives=sda --all --initlabel
-#part swap --fstype="swap" --ondisk=sda --size=1024 --label=swap
-part / --fstype="ext4" --ondisk=sda --size=3072 --grow --label=SLX_SYS
-#
-repo --name "Scientific Linux" --baseurl=http://ftp1.scientificlinux.org/linux/scientific/6.9/x86_64/os/ --cost=100
-#
-skipx
-#sshpw --username=install DPmn$65! --plaintext --lock
-#
-%packages
-@base
-@compat-libraries
-@core
-%end
diff --git a/http/ubuntu-16.04/preseed.cfg b/http/ubuntu-16.04/preseed.cfg
deleted file mode 100644
index d99a94af..00000000
--- a/http/ubuntu-16.04/preseed.cfg
+++ /dev/null
@@ -1,54 +0,0 @@
-d-i debian-installer/locale string en_US
-d-i time/zone string UTC
-d-i keyboard-configuration/xkb-keymap select de
-
-d-i mirror/country string de
-
-d-i partman-basicfilesystems/choose_label string gpt
-d-i partman-basicfilesystems/default_label string gpt
-d-i partman-basicfilesystems/no_swap boolean false
-d-i partman-partitioning/choose_label string gpt
-d-i partman-partitioning/default_label string gpt
-d-i partman/choose_label string gpt
-d-i partman/default_label string gpt
-d-i partman-auto/method string regular
-d-i partman-auto/expert_recipe string \
-  scheme ::                           \
-    32 32 32 free                     \
-      $gptonly{ }                     \
-      $primary{ }                     \
-      $bios_boot{ }                   \
-      method{ biosgrub } .            \
-    1 0 -1 ext4                       \
-      $gptonly{ }                     \
-      $primary{ }                     \
-      method{ format }                \
-      format{ }                       \
-      use_filesystem{ }               \
-      filesystem{ xfs }               \
-      label{ SLX_SYS }                \
-      mountpoint{ / } .
-d-i partman-partitioning/confirm_write_new_label boolean true
-d-i partman/choose_partition select finish
-d-i partman/confirm boolean true
-d-i partman/confirm_nooverwrite boolean true
-
-d-i base-installer/excludes string laptop-detect
-d-i passwd/make-user boolean false
-d-i passwd/root-login boolean true
-d-i user-setup/allow-password-weak boolean true
-
-## install base packages ##
-d-i pkgsel/include string curl openssh-server ansible
-d-i pkgsel/language-packs multiselect de, en
-d-i preseed/early_command string                                                                                                                \
-        mkdir -p /usr/lib/post-base-installer.d &&                                                                                              \
-        echo "sed -i -e 's/^in-target.*tasksel.*/#\\0/' /var/lib/dpkg/info/pkgsel.postinst" > /usr/lib/post-base-installer.d/90skip-tasksel &&  \
-        chmod +x /usr/lib/post-base-installer.d/90skip-tasksel
-
-d-i preseed/late_command string \
-	in-target sed -i 's,^PermitRootLogin.*,PermitRootLogin yes,' /etc/ssh/sshd_config ; \
-	in-target apt-get update ; \
-	in-target apt-get -y upgrade
-
-d-i finish-install/reboot_in_progress note
diff --git a/requirements.txt b/requirements.txt
index 881605e7..f60b3620 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,2 +1,3 @@
-ansible==4.7.0
-python-openstackclient==3.14.0
+ansible~=8.4
+ansible-core==2.15.4
+passlib==1.7.4  # required by Ansible filter `password_hash()`
diff --git a/requirements.yml b/requirements.yml
index da480e66..5764af84 100644
--- a/requirements.yml
+++ b/requirements.yml
@@ -1,41 +1,57 @@
 ---
 collections:
   - name: usegalaxy_eu.handy
-    version: 2.7.9
-    source: https://galaxy.ansible.com
+    version: 3.3.0
   - name: ansible.posix
-    version: 1.3.0
+    version: 1.5.1
     source: https://galaxy.ansible.com
   - name: amazon.aws
     version: 1.5.0
     source: https://galaxy.ansible.com
     type: galaxy
+  - name: devsec.hardening
+    version: 10.5.2
+    source: https://galaxy.ansible.com
+    type: galaxy
 roles:
-  - src: usegalaxy_eu.cuda
-    version: 1.0.4
-  - src: usegalaxy_eu.nvidia_container
-    version: 1.0.3
+  - name: usegalaxy_eu.cuda
+    version: 2.0.0
+    src: https://github.com/usegalaxy-eu/ansible-cuda
+  - name: usegalaxy_eu.nvidia_container
+    src: https://github.com/usegalaxy-eu/ansible-nvidia-container
+    version: 2.0.0
   - src: geerlingguy.docker
-    version: 4.1.3
+    version: 8.0.0
   - src: https://github.com/usegalaxy-eu/ansible-chrony
     name: influxdata.chrony
-    version: 0.1.0
+    version: 0.1.1
   - src: galaxyproject.pulsar
-    version: 1.0.9
+    version: 1.0.10
   - src: https://github.com/usegalaxy-eu/ansible-dynmotd
     name: usegalaxy-eu.dynmotd
     version: 0.0.1
-  - src: usegalaxy_eu.htcondor
-    version: 1.0.1
   - src: geerlingguy.repo-epel
     version: 3.1.0
-  - src: geerlingguy.java
-    version: 2.0.1
-  - src: galaxyproject.cvmfs
-    version: 0.2.13
+  - src: https://github.com/gsaudade99/ansible-cvmfs # Point to my fix
+    name: galaxyproject.cvmfs
+    version: a741d183cb6a5990639f8c814d6f0f19395e1f47
   - src: https://github.com/usegalaxy-eu/ansible-autofs
     name: usegalaxy-eu.autofs
-    version: 0.0.9
+    version: 1.4.1
   - name: usegalaxy-eu.autoupdates
     src: https://github.com/usegalaxy-eu/ansible-autoupdates
     version: 0.0.1
+  - name: usegalaxy-eu.fslimit
+    src: https://github.com/usegalaxy-eu/ansible-fslimit
+    version: main
+  - name: usegalaxy-eu.telegraf
+    src: https://github.com/dj-wasabi/ansible-telegraf
+    version: 0.14.1
+  - name: galaxyproject.miniconda
+    src: https://github.com/galaxyproject/ansible-miniconda
+    version: 0.3.1
+  - name: openslx-ng.dracut
+    src: https://github.com/usegalaxy-eu/ansible-dracut
+    version: 0.1.1
+  - name: usegalaxy_eu.ssh_manager
+    version: 0.0.2
diff --git a/rockylinux-8.x-x86_64.json b/rockylinux-8.x-x86_64.json
deleted file mode 100644
index 664ec002..00000000
--- a/rockylinux-8.x-x86_64.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-	"variables": {
-		"iso_url": "https://ftp.fau.de/rockylinux/8.6/isos/x86_64/Rocky-8.6-x86_64-boot.iso",
-		"iso_checksum": "fe77cc293a2f2fe6ddbf5d4bc2b5c820024869bc7ea274c9e55416d215db0cc5",
-		"iso_checksum_url": "https://ftp.fau.de/rockylinux/8.6/isos/x86_64/CHECKSUM",
-		"iso_checksum_type": "sha256",
-		"vm_name": "rockylinux-8.x-x86_64",
-		"http_dir": "http",
-		"kickstart_path": "rockylinux-8.x/anaconda-ks.cfg",
-		"shutdown_command": "systemctl poweroff",
-		"ssh_password": "password"
-	},
-	"builders": [{
-		"type": "qemu",
-		"accelerator": "kvm",
-		"iso_url": "{{ user `iso_url` }}",
-		"iso_checksum": "{{ user `iso_checksum` }}",
-		"iso_checksum_type": "{{ user `iso_checksum_type` }}",
-		"output_directory": "output-{{ user `vm_name` }}-{{ build_type }}",
-		"vm_name": "{{ user `vm_name` }}",
-		"format": "qcow2",
-		"disk_size": "{{ user `disk_size` }}",
-		"net_device": "virtio-net",
-		"disk_interface": "virtio",
-		"headless": "{{ user `headless` }}",
-		"http_directory": "{{ user `http_dir` }}",
-		"boot_command": [
-			"<esc><wait>",
-			"linux inst.mbr biosdevname=0 net.ifnames=0 ",
-			"rootpw={{ user `ssh_password` }} ",
-			"inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/{{ user `kickstart_path` }}",
-			"<enter>"
-		],
-		"boot_wait": "{{ user `boot_wait` }}",
-		"ssh_timeout": "{{ user `ssh_timeout` }}",
-		"ssh_username": "{{ user `ssh_username` }}",
-		"ssh_password": "{{ user `ssh_password` }}",
-		"shutdown_command": "{{ user `shutdown_command` }}",
-		"qemuargs": [
-			["-m", "{{ user `memory` }}"],
-			["-smp", "{{ user `cpus` }}"]
-		]
-	}],
-	"post-processors": [{
-		"type": "manifest",
-		"output": "output-{{ user `vm_name` }}-{{ build_type }}/manifest.json"
-	}]
-}
diff --git a/templates/build.pkr.hcl b/templates/build.pkr.hcl
new file mode 100644
index 00000000..0c840f3e
--- /dev/null
+++ b/templates/build.pkr.hcl
@@ -0,0 +1,76 @@
+packer {
+  required_plugins {
+    ansible = {
+      source  = "github.com/hashicorp/ansible"
+      version = "~> 1"
+    }
+  }
+}
+
+build {
+  source "source.qemu.base" {
+    name = "rockylinux-9-latest-x86_64"
+    vm_name = "rockylinux-9-latest-x86_64"
+    iso_url = "https://download.rockylinux.org/pub/rocky/9/isos/x86_64/Rocky-9-latest-x86_64-boot.iso"
+    iso_checksum = "file:https://download.rockylinux.org/pub/rocky/9/isos/x86_64/Rocky-9-latest-x86_64-boot.iso.CHECKSUM"
+    disk_size = "${local.disk_size}"
+    boot_command = [
+      "<esc><wait>",
+      "linux inst.mbr biosdevname=0 net.ifnames=0 ",
+      "rootpw=${var.ssh_password} ",
+      "inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rockylinux-9-latest-x86_64-anaconda-ks.cfg",
+      "<enter>"
+    ]
+    shutdown_command = "systemctl poweroff"
+  }
+
+  source "source.qemu.base" {
+    name = "rockylinux-10-latest-x86_64"
+    vm_name = "rockylinux-10-latest-x86_64"
+    iso_url = "https://download.rockylinux.org/pub/rocky/10/isos/x86_64/Rocky-10-latest-x86_64-boot.iso"
+    iso_checksum = "file:https://download.rockylinux.org/pub/rocky/10/isos/x86_64/Rocky-10-latest-x86_64-boot.iso.CHECKSUM"
+    disk_size = "${local.disk_size}"
+    boot_command = [
+      "<esc><wait>e",
+      "<down><down><end><wait>",
+      " inst.ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/rockylinux-10-latest-x86_64-anaconda-ks.cfg",
+      " rootpw=${var.ssh_password} ",
+      "<leftCtrlOn>x<leftCtrlOff>"
+    ]
+    shutdown_command = "systemctl poweroff"
+  }
+
+  provisioner "shell" {
+    inline = [
+      "usermod -u 99 $(id -nu 999 )",
+      "groupmod -g 99 $(getent group 999 | cut -d: -f1)",
+      "uname -r",
+      "sudo dnf update -y",
+      "dnf -y install epel-release",
+      "dnf config-manager --set-enabled crb", # Enable CRB for dependencies
+      "dnf -y install wget ansible-core",     # Use ansible-core for v10
+      "echo 'System prepared for Ansible'",
+    ]
+  }
+
+  provisioner "ansible" {
+    playbook_file    = "ansible/${local.playbook}"
+    user             = "root"
+    galaxy_file      = "requirements.yml"
+    roles_path       = "ansible/roles/"
+    collections_path = "ansible/collections/"
+    ansible_env_vars = [
+      "ANSIBLE_HOST_KEY_CHECKING=False",
+      "ANSIBLE_SSH_TRANSFER_METHOD=scp",
+      "ANSIBLE_SCP_IF_SSH=True",
+      "ANSIBLE_PIPELINING=True",
+      "ANSIBLE_SCP_EXTRA_ARGS = '-0'",
+    ]
+    extra_arguments  = "${compact([local.vault_password, var.ansible_extra_args, local.ansible_image_name])}"
+    groups           = var.groups
+  }
+
+  post-processor "manifest" {
+      output = "${var.output_directory}/${source.name}.json"
+  }
+}
diff --git a/templates/rockylinux-10-latest-x86_64-anaconda-ks.cfg b/templates/rockylinux-10-latest-x86_64-anaconda-ks.cfg
new file mode 100644
index 00000000..d5e194ac
--- /dev/null
+++ b/templates/rockylinux-10-latest-x86_64-anaconda-ks.cfg
@@ -0,0 +1,49 @@
+eula --agreed
+network --bootproto=dhcp --device=link --activate
+text
+reboot
+url --url=https://ftp.fau.de/rockylinux/10/BaseOS/x86_64/os/
+lang en_US.UTF-8
+keyboard --vckeymap=us --xlayouts='us'
+timezone Europe/Berlin --utc
+firstboot --disable
+zerombr
+clearpart --all --initlabel --drives=vda
+bootloader --location=mbr --boot-drive=vda --append="console=ttyS0,115200n8 console=tty0"
+part biosboot --fstype="biosboot" --ondisk=vda --size=1
+part /boot    --fstype="xfs"     --ondisk=vda --size=1024
+part /        --fstype="xfs"     --ondisk=vda --grow --label=system
+
+%packages
+@core
+@^minimal install
+kexec-tools
+%end
+
+# small python script to extract the password from the kernel command line
+# expects the password given as: rootpw=<password>
+%pre --interpreter=/usr/libexec/platform-python
+import shlex, crypt
+arg = 'rootpw='
+with open('/proc/cmdline', 'r') as f:
+  kcl = f.read().split()
+passwords = [x[len(arg):] for x in kcl if x.startswith(arg)]
+if len(passwords) == 1:
+  kclpass = passwords[0]
+hash = crypt.crypt(kclpass, crypt.mksalt(crypt.METHOD_SHA512))
+with open('/tmp/setup-root-pass', 'w') as f:
+  f.write('rootpw --allow-ssh --iscrypted ' + hash)
+%end
+
+%include /tmp/setup-root-pass
+
+%post --erroronfail
+grubby --update-kernel=ALL --args="console=ttyS0,115200n8 console=tty0"
+
+sudo sed -i -E \
+  -e 's/^[#[:space:]]*PermitRootLogin[[:space:]].*/PermitRootLogin yes/' \
+  -e 's/^[#[:space:]]*PasswordAuthentication[[:space:]].*/PasswordAuthentication yes/' \
+  /etc/ssh/sshd_config
+
+systemctl enable sshd
+%end
diff --git a/http/centos-8.x/anaconda-ks.cfg b/templates/rockylinux-9-latest-x86_64-anaconda-ks.cfg
similarity index 63%
rename from http/centos-8.x/anaconda-ks.cfg
rename to templates/rockylinux-9-latest-x86_64-anaconda-ks.cfg
index dee0bd19..37461fae 100644
--- a/http/centos-8.x/anaconda-ks.cfg
+++ b/templates/rockylinux-9-latest-x86_64-anaconda-ks.cfg
@@ -1,13 +1,17 @@
-install
 text
 reboot
-url --mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=BaseOS
+url --url=https://ftp.fau.de/rockylinux/9/BaseOS/x86_64/os/
 lang en_US.UTF-8
 keyboard --vckeymap=us --xlayouts='us'
 timezone Europe/Berlin --isUtc --nontp
 clearpart --none --initlabel
 bootloader --location=mbr --boot-drive=vda
-part biosboot --fstype="biosboot" --ondisk=vda --size=1
+#part biosboot --fstype="biosboot" --ondisk=vda --size=1
+# Clear the Master Boot Record
+firstboot --disable
+zerombr
+# # Remove partitions
+clearpart --all --initlabel
 part / --fstype="xfs" --ondisk=vda --grow --label=system
 
 %packages
@@ -31,24 +35,19 @@ if len(passwords) == 1:
 # generate SHA512 hash
 hash = crypt.crypt(kclpass, crypt.mksalt(crypt.METHOD_SHA512))
 with open('/tmp/setup-root-pass', 'w') as f:
-  f.write('rootpw --iscrypted ' + hash)
+  f.write('rootpw --allow-ssh --iscrypted ' + hash)
 %end
 # include the created password file
 %include /tmp/setup-root-pass
 
 %post --erroronfail
-yum -y update
-yum -y install wget
-yum -y install epel-release
-yum -y install ansible
+grubby --update-kernel=ALL --args="console=ttyS0,115200n8 console=tty0"
+
 # allow root login for ansible
-sed 's,^[[:blank:]]*#*PermitRootLogin.*,PermitRootLogin yes,g' /etc/ssh/sshd_config
+sudo sed -i -E \
+  -e 's/^[#[:space:]]*PermitRootLogin[[:space:]].*/PermitRootLogin yes/' \
+  -e 's/^[#[:space:]]*PasswordAuthentication[[:space:]].*/PasswordAuthentication yes/' \
+  /etc/ssh/sshd_config
 
-ln -s /dev/null /etc/udev/rules.d/80-net-name-slot.rules
-cat > /etc/sysconfig/network-scripts/ifcfg-eth0 <<EOF
-DEVICE="eth0"
-BOOTPROTO="dhcp"
-ONBOOT="yes"
-TYPE="Ethernet"
-EOF
+systemctl enable sshd
 %end
diff --git a/templates/sources.pkr.hcl b/templates/sources.pkr.hcl
new file mode 100644
index 00000000..aadc8190
--- /dev/null
+++ b/templates/sources.pkr.hcl
@@ -0,0 +1,67 @@
+variable "output_directory" {
+  type    = string
+  default = "images"
+}
+
+variable "boot_wait" {
+  type    = string
+  default = "10s"
+}
+
+variable "cpus" {
+  type    = string
+  default = "8"
+}
+
+variable "memory" {
+  type    = string
+  default = "8192"
+}
+
+variable "ssh_username" {
+  type    = string
+  default = "root"
+}
+
+variable "ssh_password" {
+  type    = string
+  default = "password"
+}
+
+variable "ssh_timeout" {
+  type    = string
+  default = "10m"
+}
+
+variable "http_dir" {
+  type    = string
+  default = "templates"
+}
+
+packer {
+  required_plugins {
+    qemu = {
+      version = "~> 1"
+      source  = "github.com/hashicorp/qemu"
+    }
+  }
+}
+
+source "qemu" "base" {
+  output_directory   = "${var.output_directory}"
+  accelerator        = "kvm"
+  format             = "qcow2"
+  disk_interface     = "virtio"
+  net_device         = "virtio-net"
+  headless           = "${var.headless}"
+  http_directory     = "${var.http_dir}"
+  boot_wait          = "${var.boot_wait}"
+  ssh_timeout        = "${var.ssh_timeout}"
+  ssh_username       = "${var.ssh_username}"
+  ssh_password       = "${var.ssh_password}"
+  qemuargs           = [
+    ["-m", "${var.memory}"],
+    ["-smp", "${var.cpus}"],
+    ["-cpu", "host"]
+  ]
+}
diff --git a/templates/variables.pkr.hcl b/templates/variables.pkr.hcl
new file mode 100644
index 00000000..7f05f6b8
--- /dev/null
+++ b/templates/variables.pkr.hcl
@@ -0,0 +1,52 @@
+variable "groups" {
+  # Control the playbooks the image is provisioned with.
+  /* Using this variable, it is possible to control which playbooks the Ansible
+     provisioner will run.
+
+     The Ansible provisioner is configured in "build.pkr.hcl". This variable
+     defines the Ansible groups considered during provisioning. To provision an
+     image, the Ansible provisioner will run the playbook
+     "ansible/all-playbooks.yml", that simply imports all other playbooks in
+     the order in which they are expected to be run. Each playbook contains
+     plays that only apply to hosts belonging to a group with the same name.
+
+     The end result is that the playbooks with names matching the names defined
+     in this variable will be the ones run by the provisioner (but not
+     necessarily in the same order).
+  */
+  type    = list(string)
+  default = ["generic"]
+}
+
+variable "headless" {
+  # Display a window showing the screen of the QEMU virtual machine.
+  /* Controls whether a window showing the screen of the virtual machine being
+     used to create the image should be displayed.
+  */
+  type    = string
+  default = "true"
+}
+locals {
+  playbook = contains(var.groups, "internal") ? "playbooks-internal.yml" : "playbooks-external.yml"
+}
+locals {
+  vault_password = contains(var.groups, "internal") ? "--vault-password-file=${var.vault_password_file}" : null
+}
+locals {
+  ansible_image_name = "-e build_tag='${var.image_name}'"
+}
+local "disk_size" {
+  expression = "${contains(var.groups, "workers") ? "50G" : "10G"}"
+}
+variable "vault_password_file" {
+  type    = string
+  default = ".vault_password"
+}
+variable "image_name" {
+  type = string
+  default = ""
+}
+variable "ansible_extra_args" {
+  type = string
+  default = null
+}