diff --git a/agenix/hosts/mediaserver/config.nix b/agenix/hosts/mediaserver/config.nix
index 39f2edb..5196bcf 100644
--- a/agenix/hosts/mediaserver/config.nix
+++ b/agenix/hosts/mediaserver/config.nix
@@ -17,5 +17,13 @@
     wireguard-config = {
       file = ./wireguard/config.age;
     };
+
+    tubearchivist-environment-ta = {
+      file = ./tubearchivist/environmentTA.age;
+    };
+
+    tubearchivist-environment-es = {
+      file = ./tubearchivist/environmentES.age;
+    };
   };
 }
diff --git a/agenix/hosts/mediaserver/tubearchivist/environmentES.age b/agenix/hosts/mediaserver/tubearchivist/environmentES.age
new file mode 100644
index 0000000..1a96248
--- /dev/null
+++ b/agenix/hosts/mediaserver/tubearchivist/environmentES.age
@@ -0,0 +1,9 @@
+age-encryption.org/v1
+-> ssh-ed25519 MtGp6g ieA0BUCb36AR1ElLDpVwymxSpZFLJk0Ky95oy8ArdHA
+IGJpaxn0ddD1OsVMK6zaMOOk4pnnp8nrQKeRQ0riBT8
+-> ssh-ed25519 Y94Yig ZLZDGMPbK6LHx2PzYIWSEBYKURRCvkJJL7fSBapnwQU
+/pASdlY8V1kxr5TUfAXkOPEIqTLlLyB4VY1BH9pHpoM
+-> q5kUUD^-grease
+3Ilo/+uADYf2hqTaXsQR1UtCV4YZosoOYnxjY1hrmssCHJY
+--- TPwvrGYvKfDME3WTFgyv9pOR7nOPHPCFylQzE4qV2kk
+\.��ꋶ�}�?�BG����6,ky�����$�宽O\-��A'��s&[8_f���{�5s'm��LZJV�|�R\�Ϳ�/��Dr@Xœ��!Q��4o���AS�������(�W
R��Q��>��`�c\� f��(٧6�Ǚ�a���������t܁�M$x���;�`b�O}�]�ą��	Iy��=Vk��|
\ No newline at end of file
diff --git a/agenix/hosts/mediaserver/tubearchivist/environmentTA.age b/agenix/hosts/mediaserver/tubearchivist/environmentTA.age
new file mode 100644
index 0000000..5574cd1
--- /dev/null
+++ b/agenix/hosts/mediaserver/tubearchivist/environmentTA.age
@@ -0,0 +1,9 @@
+age-encryption.org/v1
+-> ssh-ed25519 MtGp6g ursvuiyjKkXNcAPEn5iOK7Nsg1x+RJhAHdNwWB/1hho
+OdN5lEWaQgd+B/U6wKszQbDyp6MzepIq5xnsvJ/uiYQ
+-> ssh-ed25519 Y94Yig FCpPV0eILzRUfABR8vY1X48Tw+VBrBtPd9ZoGq/k2V4
+uS5pUgxD/5wwCFVH5UX6h4GRCvs7ajEqM9HUkgpiMVE
+-> ?`.}^-grease }s:[/Y+} 81$^9e 1 /'
+hyFuWow2oXRk+HRjPQJHQputCUFLWUxcOthm5aQ
+--- RTAPvC+ShrGZPxz9EEyeCOERlBtwkLSczpqz0s6k058
+�爸�4^%!�'�/�kF1x��)u�b?�'z,���jiN�@r�=:��}3��"�2h�n迄����v{=�����Ls&��M-y�<R�W�dzUc�!6��Ғ��+���A��m|Sc�M�}U4��}E�rv�ȹ�DS�`�A�7���^3�K�0z��/!3��W�V���a1]J�E����xZ�T@�����vl�[���u~;�U�ht}�[�;��F����
O~r�(2��/a�:�Q�[VS5{�s(,4{z�]7��[Rb��z�+d�Z�
\ No newline at end of file
diff --git a/container/tubearchivist/default.nix b/container/tubearchivist/default.nix
new file mode 100644
index 0000000..e1ebd6e
--- /dev/null
+++ b/container/tubearchivist/default.nix
@@ -0,0 +1,38 @@
+{ config, ... }:
+
+{
+  systemd.tmpfiles.rules = [
+    "d /var/lib/tubearchivist 0755 root root"
+    "d /var/lib/tubearchivist/redis 0755 root root"
+    "d /var/lib/tubearchivist/es 0755 root root"
+  ];
+
+  # virtualisation.oci-containers.containers = {
+  #   tubearchivist = {
+  #     image = "docker.io/bbilly1/tubearchivist:latest";
+  #     dependsOn = [ "archivist-es" "archivist-redis" ];
+  #     ports = [ "127.0.0.1:9887:8000" ];
+  #     environmentFiles = [ config.age.secrets.tubearchivist-environment-ta.path ];
+  #     volumes = [
+  #       "/mnt/media/YTDL/Downloads:/youtube"
+  #       "/mnt/media/YTDL/Cache:/cache"
+  #     ];
+  #   };
+  #
+  #   archivist-redis = {
+  #     image = "docker.io/redis/redis-stack-server:latest";
+  #     volumes = [
+  #       "/var/lib/tubearchivist/redis:/data"
+  #     ];
+  #   };
+  #
+  #   archivist-es = {
+  #     image = "docker.io/bbilly1/tubearchivist-es:latest";
+  #     environmentFiles = [ config.age.secrets.tubearchivist-environment-es.path ];
+  #     extraOptions = [ "--ulimit memlock=-1:-1" ];
+  #     volumes = [
+  #       "/var/lib/tubearchivist/es:/usr/share/elasticsearch/data"
+  #     ];
+  #   };
+  # };
+}
diff --git a/secret/container/additional-media/default.nix b/secret/container/additional-media/default.nix
index a7c8b91..0a4793b 100644
Binary files a/secret/container/additional-media/default.nix and b/secret/container/additional-media/default.nix differ
diff --git a/secrets.nix b/secrets.nix
index bcd6a3d..3d5ef6b 100644
--- a/secrets.nix
+++ b/secrets.nix
@@ -63,4 +63,8 @@ in
   "agenix/hosts/mediaserver/tailscale/authkey.age".publicKeys = mediaserver;
 
   "agenix/hosts/mediaserver/wireguard/config.age".publicKeys = mediaserver;
+
+  "agenix/hosts/mediaserver/tubearchivist/environmentTA.age".publicKeys = mediaserver;
+
+  "agenix/hosts/mediaserver/tubearchivist/environmentES.age".publicKeys = mediaserver;
 }
diff --git a/system/hosts/mediaserver.nix b/system/hosts/mediaserver.nix
index 08c2fe9..df37116 100644
--- a/system/hosts/mediaserver.nix
+++ b/system/hosts/mediaserver.nix
@@ -27,6 +27,7 @@ in
     ../nixos/jellyfin.nix
 
     ../nixos/container.nix
+    ../../container/tubearchivist
     ../../secret/container/additional-media
   ];