diff --git a/docs/decisions/001-Purpose.md b/docs/decisions/001-Purpose.md
deleted file mode 100644
index 77b29066..00000000
--- a/docs/decisions/001-Purpose.md
+++ /dev/null
@@ -1,32 +0,0 @@
-Purpose of this repo
-====================
-
-
-The goal of this project is to make a flexible renderer of a manifest for openedx hosting.
-
-
-Context:
---------
-
-- Explanation of groove and subsequent forum conversation:
-    * https://discuss.openedx.org/t/tech-talk-demo-deploying-multiple-open-edx-instances-onto-a-kubernetes-cluster-with-tutor/4641
-    * https://forum.opencraft.com/t/tech-talk-demo-deploying-multiple-open-edx-instances-onto-a-kubernetes-cluster-with-tutor/887
-- Proposal of making tutor the supported installation https://discuss.openedx.org/t/lets-talk-about-the-native-installation/3269
-- oep-45: https://open-edx-proposals.readthedocs.io/en/latest/architectural-decisions/oep-0045-arch-ops-and-config.html
-- oep-45-ADR-tutor: https://open-edx-proposals.readthedocs.io/en/latest/architectural-decisions/oep-0045-arch-ops-and-config.html
-- Braindump on Configuration: Today and Future with Cory Lee from edx https://drive.google.com/file/d/1wWfTbhy2blF526Fi4IvJQyFLz_3rawIX/view
-- Notes of the BTR meeting in Lisbon https://discuss.openedx.org/t/build-test-release-notes-lisbon-2022/7133
-
-
-Decision:
----------
-
-1. Create a POC for a ver flexible builder of manifests that focuses on the usecases not covered already by tutor.
-2. Use a very flexible architecture that is open for extension from the very conception. Hexagonal architecture was chosen for this.
-
-
-Consequence:
-------------
-
-1. The builder should work as a tutor plugin. Even if it has other standalone cases.
-2. Every piece of the builder should be able to be replaced by a different implementation of the same interface.
diff --git a/drydock_backups/README.rst b/drydock_backups/README.rst
deleted file mode 100644
index fbb58d18..00000000
--- a/drydock_backups/README.rst
+++ /dev/null
@@ -1,55 +0,0 @@
-Drydock-backups
-================
-
-This is a tutor plugin used to easily store backups of mysql and mongodb databases through k8s cronjobs. It backups the databases and stores them in a bucket.
-
-This plugin assumes that the destination bucket is already created and that the credentials to access it are already configured (Works with S3 and Minio buckets indicating his endpoint url through `BACKUP_CUSTOM_STORAGE_ENDPOINT`).
-
-Installation and activation
----------------------------
-
-It is included with the Drydock installation, so there's no need to install it separately.
-
-You can enable it adding `drydock-backups` to the `plugins` section of the `config.yml` file.
-
-Configuration variables
------------------------
-
-- **BACKUP_DOCKER_IMAGE**: The image used to run the cronjob. (default: `ednxops/shipyard-utils:v{{BACKUP_VERSION}}`)
-- **BACKUP_CRON_SCHEDULE**: Cron schedule to run the backup. (default: `0 2 * * *`)
-- **BACKUP_STORAGE_SERVICE**: Storage service to use. (default: `aws-s3`) (options: `aws-s3`, `azure-blob`)
-- **BACKUP_AWS_ACCESS_KEY**: AWS access key to access the bucket or minIO user.
-- **BACKUP_AWS_SECRET_KEY**: AWS secret key to access the bucket or minIO password.
-- **BACKUP_BUCKET_NAME**: Name of the bucket where the backups will be stored.
-- **BACKUP_BUCKET_PATH**: Path inside the bucket where the backups will be stored.
-- **BACKUP_CUSTOM_STORAGE_ENDPOINT**: Custom endpoint to access the bucket. (default: `None`)
-- **BACKUP_AZURE_CONTAINER_NAME**: Name of the container where the backups will be stored.
-- **BACKUP_AZURE_ACCOUNT_NAME**: Name of the account to access the container.
-- **BACKUP_AZURE_CONTAINER_SAS_TOKEN**: SAS token to access the container.
-- **BACKUP_K8S_USE_EPHEMERAL_VOLUMES**: Use ephemeral volumes to set up the cronjob. (default: `False`)
-- **BACKUP_K8S_EPHEMERAL_VOLUME_SIZE**: Size of the ephemeral volume. (default: `8Gi`)
-- **BACKUP_MYSQL_USERNAME**: Username to access the mysql database. (default: `{{ MYSQL_ROOT_USERNAME }}`)
-- **BACKUP_MYSQL_PASSWORD**: Password to access the mysql database. (default: `{{ MYSQL_ROOT_PASSWORD }}`)
-- **BACKUP_MONGO_PASSWORD**: Password to access the mongodb database. (default: `{{ MONGODB_PASSWORD }}`)
-- **BACKUP_MONGO_USERNAME**: Username to access the mongodb database. (default: `{{ MONGODB_USERNAME }}`)
-
-You can set ups these variables in the `config.yml` file.
-
-Docker image
-------------
-
-The docker image used to run the cronjob is `ednxops/shipyard-utils:v1.0.0` and it is available in `DockerHub <https://hub.docker.com/r/ednxops/shipyard-utils>`_.
-
-When `drydock-backups` is installed in your manifests, you can build the Docker image using the following commands:
-
-.. code-block:: bash
-
-    tutor images build backups
-    tutor images push backups
-
-Utilities
----------
-
-In the path `/utils` we have some utilities to help us managing the backups.
-
-- **s3_backups_expiration**: This terraform script is to add to S3 bucket lifecycle rules. Is used to delete the backups that are older than a certain number of days.
diff --git a/drydock_backups/__about__.py b/drydock_backups/__about__.py
deleted file mode 100644
index 3dc1f76b..00000000
--- a/drydock_backups/__about__.py
+++ /dev/null
@@ -1 +0,0 @@
-__version__ = "0.1.0"
diff --git a/drydock_backups/__init__.py b/drydock_backups/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/drydock_backups/patches/.gitignore b/drydock_backups/patches/.gitignore
deleted file mode 100644
index e69de29b..00000000
diff --git a/drydock_backups/patches/drydock-multipurpose-jobs b/drydock_backups/patches/drydock-multipurpose-jobs
deleted file mode 100644
index 2fc4345c..00000000
--- a/drydock_backups/patches/drydock-multipurpose-jobs
+++ /dev/null
@@ -1,154 +0,0 @@
----
-apiVersion: batch/v1
-kind: CronJob
-metadata:
-  name: backup-mysql-cron
-  labels:
-    app.kubernetes.io/component: cronjob
-spec:
-  suspend: false
-  schedule: {{ BACKUP_CRON_SCHEDULE }}
-  startingDeadlineSeconds: 900
-  successfulJobsHistoryLimit: 3
-  failedJobsHistoryLimit: 3
-  jobTemplate:
-    spec:
-      template:
-        spec:
-          securityContext:
-            runAsUser: 1000
-            runAsGroup: 1000
-            fsGroup: 1000
-            fsGroupChangePolicy: "OnRootMismatch"
-          restartPolicy: OnFailure
-          containers:
-            - name: backup
-              image: {{ BACKUP_DOCKER_IMAGE }}
-              env:
-                - name: MYSQL_HOST
-                  value: '{{ MYSQL_HOST }}'
-                - name: MYSQL_PORT
-                  value: '{{ MYSQL_PORT }}'
-                - name: MYSQL_ROOT_USERNAME
-                  value: '{{ BACKUP_MYSQL_USERNAME }}'
-                - name: MYSQL_ROOT_PASSWORD
-                  value: '{{ BACKUP_MYSQL_PASSWORD }}'
-                - name: BACKUP_STORAGE_SERVICE
-                  value: '{{ BACKUP_STORAGE_SERVICE }}'
-                - name: BUCKET_PATH
-                  value: '{{ BACKUP_BUCKET_PATH }}'
-                {%- if BACKUP_STORAGE_SERVICE == "aws-s3" %}
-                - name: AWS_ACCESS_KEY_ID
-                  value: '{{ BACKUP_AWS_ACCESS_KEY }}'
-                - name: AWS_SECRET_ACCESS_KEY
-                  value: '{{ BACKUP_AWS_SECRET_KEY }}'
-                - name: S3_BUCKET_NAME
-                  value: '{{ BACKUP_BUCKET_NAME }}'
-                  {%- if BACKUP_CUSTOM_STORAGE_ENDPOINT %}
-                - name: BACKUP_CUSTOM_STORAGE_ENDPOINT
-                  value: '{{ BACKUP_CUSTOM_STORAGE_ENDPOINT }}'
-                  {%- endif %}
-                {%- elif BACKUP_STORAGE_SERVICE == "azure-blob" %}
-                - name: AZURE_CONTAINER_NAME
-                  value: '{{ BACKUP_AZURE_CONTAINER_NAME }}'
-                - name: AZURE_CONTAINER_SAS_TOKEN
-                  value: '{{ BACKUP_AZURE_CONTAINER_SAS_TOKEN }}'
-                - name: AZURE_ACCOUNT_NAME
-                  value: '{{ BACKUP_AZURE_ACCOUNT_NAME }}'
-                {%- endif %}
-              {%- if BACKUP_K8S_USE_EPHEMERAL_VOLUMES %}
-              volumeMounts:
-                - mountPath: /data/
-                  name: backup-volume
-              {%- endif %}
-              args:
-                - mysql
-          {%- if BACKUP_K8S_USE_EPHEMERAL_VOLUMES %}
-          volumes:
-            - name: backup-volume
-              ephemeral:
-                volumeClaimTemplate:
-                  spec:
-                    accessModes:
-                      - ReadWriteOnce
-                    resources:
-                      requests:
-                        storage: {{ BACKUP_K8S_EPHEMERAL_VOLUME_SIZE }}
-          {%- endif %}
----
-apiVersion: batch/v1
-kind: CronJob
-metadata:
-  name: backup-mongo-cron
-  labels:
-    app.kubernetes.io/component: cronjob
-spec:
-  suspend: false
-  schedule: {{ BACKUP_CRON_SCHEDULE }}
-  startingDeadlineSeconds: 900
-  successfulJobsHistoryLimit: 3
-  failedJobsHistoryLimit: 3
-  jobTemplate:
-    spec:
-      template:
-        spec:
-          securityContext:
-            runAsUser: 1000
-            runAsGroup: 1000
-            fsGroup: 1000
-            fsGroupChangePolicy: "OnRootMismatch"
-          restartPolicy: OnFailure
-          containers:
-            - name: backup
-              image: {{ BACKUP_DOCKER_IMAGE }}
-              env:
-                - name: MONGODB_HOST
-                  value: '{{ MONGODB_HOST }}'
-                - name: MONGODB_PORT
-                  value: '{{ MONGODB_PORT }}'
-                - name: MONGODB_USERNAME
-                  value: '{{ BACKUP_MONGO_USERNAME }}'
-                - name: MONGODB_PASSWORD
-                  value: '{{ BACKUP_MONGO_PASSWORD }}'
-                - name: BACKUP_STORAGE_SERVICE
-                  value: '{{ BACKUP_STORAGE_SERVICE }}'
-                - name: BUCKET_PATH
-                  value: '{{ BACKUP_BUCKET_PATH }}'
-                {%- if BACKUP_STORAGE_SERVICE == "aws-s3" %}
-                - name: AWS_ACCESS_KEY_ID
-                  value: '{{ BACKUP_AWS_ACCESS_KEY }}'
-                - name: AWS_SECRET_ACCESS_KEY
-                  value: '{{ BACKUP_AWS_SECRET_KEY }}'
-                - name: S3_BUCKET_NAME
-                  value: '{{ BACKUP_BUCKET_NAME }}'
-                  {%- if BACKUP_CUSTOM_STORAGE_ENDPOINT %}
-                - name: BACKUP_CUSTOM_STORAGE_ENDPOINT
-                  value: '{{ BACKUP_CUSTOM_STORAGE_ENDPOINT }}'
-                  {%- endif %}
-                {%- elif BACKUP_STORAGE_SERVICE == "azure-blob" %}
-                - name: AZURE_CONTAINER_NAME
-                  value: '{{ BACKUP_AZURE_CONTAINER_NAME }}'
-                - name: AZURE_CONTAINER_SAS_TOKEN
-                  value: '{{ BACKUP_AZURE_CONTAINER_SAS_TOKEN }}'
-                - name: AZURE_ACCOUNT_NAME
-                  value: '{{ BACKUP_AZURE_ACCOUNT_NAME }}'
-                {%- endif %}
-              {%- if BACKUP_K8S_USE_EPHEMERAL_VOLUMES %}
-              volumeMounts:
-                - mountPath: /data/
-                  name: backup-volume
-              {%- endif %}
-              args:
-                - mongo
-          {%- if BACKUP_K8S_USE_EPHEMERAL_VOLUMES %}
-          volumes:
-            - name: backup-volume
-              ephemeral:
-                volumeClaimTemplate:
-                  spec:
-                    accessModes:
-                      - ReadWriteOnce
-                    resources:
-                      requests:
-                        storage: {{ BACKUP_K8S_EPHEMERAL_VOLUME_SIZE }}
-          {%- endif %}
diff --git a/drydock_backups/plugin.py b/drydock_backups/plugin.py
deleted file mode 100644
index 7930ca1f..00000000
--- a/drydock_backups/plugin.py
+++ /dev/null
@@ -1,230 +0,0 @@
-from __future__ import annotations
-
-import os
-import os.path
-from glob import glob
-
-import click
-import pkg_resources
-from tutor import hooks
-
-from drydock.__about__ import __version__
-
-config = {
-    "defaults": {
-        "VERSION": __version__,
-        "DOCKER_IMAGE": "ednxops/shipyard-utils:v{{BACKUP_VERSION}}",
-        "CRON_SCHEDULE": '0 2 * * *',
-        "STORAGE_SERVICE": "aws-s3",
-        "AWS_ACCESS_KEY": "",
-        "AWS_SECRET_KEY": "",
-        "BUCKET_NAME": "",
-        "BUCKET_PATH": "backups",
-        "AZURE_CONTAINER_NAME": "",
-        "AZURE_CONTAINER_SAS_TOKEN": "",
-        "AZURE_ACCOUNT_NAME": "",
-        "CUSTOM_STORAGE_ENDPOINT": None,
-        "K8S_USE_EPHEMERAL_VOLUMES": False,
-        "K8S_EPHEMERAL_VOLUME_SIZE": "8Gi",
-        "MYSQL_USERNAME": '{{ MYSQL_ROOT_USERNAME }}',
-        "MYSQL_PASSWORD": '{{ MYSQL_ROOT_PASSWORD }}',
-        "MONGO_PASSWORD": '{{ MONGODB_PASSWORD }}',
-        "MONGO_USERNAME": '{{ MONGODB_USERNAME }}',
-    },
-}
-
-hooks.Filters.CONFIG_DEFAULTS.add_items(
-    [
-        (f"BACKUP_{key}", value)
-        for key, value in config.get("defaults", {}).items()
-    ]
-)
-
-hooks.Filters.CONFIG_UNIQUE.add_items(
-    [
-        (f"BACKUP_{key}", value)
-        for key, value in config.get("unique", {}).items()
-    ]
-)
-
-hooks.Filters.CONFIG_OVERRIDES.add_items(
-    list(config.get("overrides", {}).items())
-)
-
-
-########################################
-# INITIALIZATION TASKS
-########################################
-
-# To add a custom initialization task, create a bash script template under:
-# drydock_backups/templates/drydock-backups/jobs/init/
-# and then add it to the MY_INIT_TASKS list. Each task is in the format:
-# ("<service>", ("<path>", "<to>", "<script>", "<template>"))
-MY_INIT_TASKS: list[tuple[str, tuple[str, ...]]] = [
-    # For example, to add LMS initialization steps, you could add the script template at:
-    # drydock_backups/templates/drydock-backups/jobs/init/lms.sh
-    # And then add the line:
-    ### ("lms", ("drydock-backups", "jobs", "init", "lms.sh")),
-]
-
-
-# For each task added to MY_INIT_TASKS, we load the task template
-# and add it to the CLI_DO_INIT_TASKS filter, which tells Tutor to
-# run it as part of the `init` job.
-for service, template_path in MY_INIT_TASKS:
-    full_path: str = pkg_resources.resource_filename(
-        "drydock_backups", os.path.join("templates", *template_path)
-    )
-    with open(full_path, encoding="utf-8") as init_task_file:
-        init_task: str = init_task_file.read()
-    hooks.Filters.CLI_DO_INIT_TASKS.add_item((service, init_task))
-
-
-########################################
-# DOCKER IMAGE MANAGEMENT
-########################################
-
-
-# Images to be built by `tutor images build`.
-# Each item is a quadruple in the form:
-#     ("<tutor_image_name>", ("path", "to", "build", "dir"), "<docker_image_tag>", "<build_args>")
-hooks.Filters.IMAGES_BUILD.add_items([
-    (
-        "backups",
-        ("plugins", "drydock-backups", "build", "backups"),
-        "{{BACKUP_DOCKER_IMAGE}}",
-        (),
-    )
-])
-
-
-# Images to be pulled as part of `tutor images pull`.
-# Each item is a pair in the form:
-#     ("<tutor_image_name>", "<docker_image_tag>")
-hooks.Filters.IMAGES_PULL.add_items([
-    (
-        "backups",
-        "{{BACKUP_DOCKER_IMAGE}}",
-    )
-])
-
-
-# Images to be pushed as part of `tutor images push`.
-# Each item is a pair in the form:
-#     ("<tutor_image_name>", "<docker_image_tag>")
-hooks.Filters.IMAGES_PUSH.add_items([
-    (
-        "backups",
-        "{{BACKUP_DOCKER_IMAGE}}",
-    )
-])
-
-
-########################################
-# TEMPLATE RENDERING
-# (It is safe & recommended to leave
-#  this section as-is :)
-########################################
-
-hooks.Filters.ENV_TEMPLATE_ROOTS.add_items(
-    # Root paths for template files, relative to the project root.
-    [
-        pkg_resources.resource_filename("drydock_backups", "templates"),
-    ]
-)
-
-hooks.Filters.ENV_TEMPLATE_TARGETS.add_items(
-    # For each pair (source_path, destination_path):
-    # templates at ``source_path`` (relative to your ENV_TEMPLATE_ROOTS) will be
-    # rendered to ``source_path/destination_path`` (relative to your Tutor environment).
-    # For example, ``drydock_backups/templates/drydock-backups/build``
-    # will be rendered to ``$(tutor config printroot)/env/plugins/drydock-backups/build``.
-    [
-        ("drydock-backups/build", "plugins"),
-        ("drydock-backups/apps", "plugins"),
-    ],
-)
-
-
-########################################
-# PATCH LOADING
-# (It is safe & recommended to leave
-#  this section as-is :)
-########################################
-
-# For each file in drydock_backups/patches,
-# apply a patch based on the file's name and contents.
-for path in glob(
-    os.path.join(
-        pkg_resources.resource_filename("drydock_backups", "patches"),
-        "*",
-    )
-):
-    with open(path, encoding="utf-8") as patch_file:
-        hooks.Filters.ENV_PATCHES.add_item((os.path.basename(path), patch_file.read()))
-
-
-########################################
-# CUSTOM JOBS (a.k.a. "do-commands")
-########################################
-
-# A job is a set of tasks, each of which run inside a certain container.
-# Jobs are invoked using the `do` command, for example: `tutor local do importdemocourse`.
-# A few jobs are built in to Tutor, such as `init` and `createuser`.
-# You can also add your own custom jobs:
-
-# To add a custom job, define a Click command that returns a list of tasks,
-# where each task is a pair in the form ("<service>", "<shell_command>").
-# For example:
-### @click.command()
-### @click.option("-n", "--name", default="plugin developer")
-### def say_hi(name: str) -> list[tuple[str, str]]:
-###     """
-###     An example job that just prints 'hello' from within both LMS and CMS.
-###     """
-###     return [
-###         ("lms", f"echo 'Hello from LMS, {name}!'"),
-###         ("cms", f"echo 'Hello from CMS, {name}!'"),
-###     ]
-
-
-# Then, add the command function to CLI_DO_COMMANDS:
-## hooks.Filters.CLI_DO_COMMANDS.add_item(say_hi)
-
-# Now, you can run your job like this:
-#   $ tutor local do say-hi --name="Atlas"
-
-
-#######################################
-# CUSTOM CLI COMMANDS
-#######################################
-
-# Your plugin can also add custom commands directly to the Tutor CLI.
-# These commands are run directly on the user's host computer
-# (unlike jobs, which are run in containers).
-
-# To define a command group for your plugin, you would define a Click
-# group and then add it to CLI_COMMANDS:
-
-
-### @click.group()
-### def drydock-backups() -> None:
-###     pass
-
-
-### hooks.Filters.CLI_COMMANDS.add_item(drydock-backups)
-
-
-# Then, you would add subcommands directly to the Click group, for example:
-
-
-### @drydock-backups.command()
-### def example_command() -> None:
-###     """
-###     This is helptext for an example command.
-###     """
-###     print("You've run an example command.")
-
-
-# This would allow you to run:
-#   $ tutor drydock-backups example-command
diff --git a/drydock_backups/templates/drydock-backups/apps/.gitignore b/drydock_backups/templates/drydock-backups/apps/.gitignore
deleted file mode 100644
index e69de29b..00000000
diff --git a/drydock_backups/templates/drydock-backups/build/backups/Dockerfile b/drydock_backups/templates/drydock-backups/build/backups/Dockerfile
deleted file mode 100644
index 1d1845a9..00000000
--- a/drydock_backups/templates/drydock-backups/build/backups/Dockerfile
+++ /dev/null
@@ -1,29 +0,0 @@
-FROM mysql:5.7-debian as base
-
-RUN apt-get update && apt-get install -y wget gnupg2
-
-RUN wget -qO - https://www.mongodb.org/static/pgp/server-4.4.asc | apt-key add -
-
-RUN echo "deb http://repo.mongodb.org/apt/debian buster/mongodb-org/4.4 main" | tee /etc/apt/sources.list.d/mongodb-org-4.4.list
-
-RUN apt-get update && apt-get install -y \
-    mongodb-org \
-    awscli \
-    && rm -rf /var/lib/apt/lists/*
-
-RUN wget -O /tmp/azcopy.tar.gz https://aka.ms/downloadazcopy-v10-linux \
-    && tar -xvf /tmp/azcopy.tar.gz -C /tmp \
-    && cp /tmp/azcopy_linux_amd64*/azcopy /usr/bin/ \
-    && chmod +x /usr/bin/azcopy \
-    && rm -rf /tmp/azcopy*
-
-RUN useradd -m backupuser
-RUN echo "backupuser ALL=(ALL) NOPASSWD: /usr/bin/mysql, /usr/bin/mongodump" >> /etc/sudoers
-
-USER backupuser
-
-WORKDIR /data
-
-COPY docker-entrypoint.sh /usr/local/bin/
-
-ENTRYPOINT ["docker-entrypoint.sh"]
diff --git a/drydock_backups/templates/drydock-backups/build/backups/docker-entrypoint.sh b/drydock_backups/templates/drydock-backups/build/backups/docker-entrypoint.sh
deleted file mode 100755
index 9eba32ee..00000000
--- a/drydock_backups/templates/drydock-backups/build/backups/docker-entrypoint.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-#! /bin/bash
-
-set -eo pipefail
-
-FILENAME="$(date +'%Y-%m-%d').gz"
-
-MONGODB_URI="mongodb://"
-MONGODB_PORT=${MONGODB_PORT:-27017}
-MONGODB_HOST=${MONGODB_HOST:-mongodb}
-MONGODB_AUTHDB=${MONGODB_AUTHDB:-admin}
-MONGODB_AUTHDB_STRING="authSource=${MONGODB_AUTHDB}"
-
-if [ -z ${MONGODB_USERNAME} ] && [ -z ${MONGODB_PASSWORD} ]; then
-    MONGODB_AUTHDB_STRING=""
-else
-    MONGODB_URI+="${MONGODB_USERNAME}:${MONGODB_PASSWORD}@"
-fi
-
-MONGODB_URI+="${MONGODB_HOST}:${MONGODB_PORT}/?${MONGODB_AUTHDB_STRING}"
-
-if [ "$1" = 'mysql' ]; then
-      mysqldump -u $MYSQL_ROOT_USERNAME -h $MYSQL_HOST -P $MYSQL_PORT --password=$MYSQL_ROOT_PASSWORD \
-            --all-databases --single-transaction --flush-logs | gzip > $FILENAME
-elif [ "$1" = 'mongo' ]; then
-      mongodump --uri="${MONGODB_URI}" --gzip --archive=$FILENAME
-else
-    echo "Unknown database type"
-    exit 1
-fi
-
-if [ "$BACKUP_STORAGE_SERVICE" = 'aws-s3' ]; then
-      if [[ -z "${BACKUP_CUSTOM_STORAGE_ENDPOINT}" ]]; then
-            aws s3 mv $FILENAME s3://$S3_BUCKET_NAME/$BUCKET_PATH/$1/
-      else
-            aws --endpoint-url $BACKUP_CUSTOM_STORAGE_ENDPOINT s3 mv $FILENAME s3://$S3_BUCKET_NAME/$BUCKET_PATH/$1/
-      fi
-elif [ "$BACKUP_STORAGE_SERVICE" = 'azure-blob' ]; then
-      azcopy cp $FILENAME https://$AZURE_ACCOUNT_NAME.blob.core.windows.net/$AZURE_CONTAINER_NAME/$BUCKET_PATH/${1}/$FILENAME?$AZURE_CONTAINER_SAS_TOKEN
-else
-    echo "Unknown storage service"
-    exit 1
-fi
diff --git a/drydock_backups/templates/drydock-backups/jobs/init/.gitignore b/drydock_backups/templates/drydock-backups/jobs/init/.gitignore
deleted file mode 100644
index e69de29b..00000000
diff --git a/drydock_backups/utils/s3_backups_expiration/main.tf b/drydock_backups/utils/s3_backups_expiration/main.tf
deleted file mode 100644
index 558a7c67..00000000
--- a/drydock_backups/utils/s3_backups_expiration/main.tf
+++ /dev/null
@@ -1,29 +0,0 @@
-terraform {
-  required_providers {
-    aws = {
-      source = "hashicorp/aws"
-      version = "4.61.0"
-    }
-  }
-}
-
-provider "aws" {
-    region = "{{REGION}}"
-}
-
-resource "aws_s3_bucket_lifecycle_configuration" "backups_lifecycle" {
-  rule {
-    id      = "expire-backups-after-30-day"
-    status  = "Enabled"
-
-    filter {
-      prefix = "{{BACKUP-PATH}}"
-    }
-
-    expiration {
-      days = 30
-    }
-  }
-
-  bucket = "{{BUCKET-NAME}}"
-}
diff --git a/setup.py b/setup.py
index 76792f17..b86c4874 100644
--- a/setup.py
+++ b/setup.py
@@ -38,13 +38,9 @@ def load_about():
     long_description=load_readme(),
     packages=find_packages(exclude=["tests*"]),
     include_package_data=True,
-    python_requires=">=3.7",
-    install_requires=["tutor", "packaging"],
-    entry_points={
-        "tutor.plugin.v1": [
-            "drydock = drydock.plugin",
-            "drydock-backups = drydock_backups.plugin",
-        ]
+    python_requires=">=3.8",
+    install_requires=["tutor>=16.0.0,<17.0.0"],
+    entry_points={"tutor.plugin.v1": ["drydock = drydock.plugin"]
     },
     classifiers=[
         "Development Status :: 3 - Alpha",
@@ -52,7 +48,6 @@ def load_about():
         "License :: OSI Approved :: GNU Affero General Public License v3",
         "Operating System :: OS Independent",
         "Programming Language :: Python",
-        "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",