diff --git a/machines/drone/configuration.nix b/machines/drone/configuration.nix
index 76187d1..77e6225 100644
--- a/machines/drone/configuration.nix
+++ b/machines/drone/configuration.nix
@@ -11,7 +11,7 @@
       enable = true;
       server = true;
     };
-    docker.enable = true;
+    podman.enable = true;
     # drone.enable = true;
     nix-common = {
       enable = true;
diff --git a/machines/loki/configuration.nix b/machines/loki/configuration.nix
index fc15759..4213069 100644
--- a/machines/loki/configuration.nix
+++ b/machines/loki/configuration.nix
@@ -40,7 +40,6 @@
       enable = true;
       wayland = true;
     };
-    docker.enable = true;
     element-web.enable = false;
     fonts.enable = true;
     gnome.enable = true;
@@ -63,6 +62,7 @@
       enable = true;
       cross-systems = [ "aarch64-linux" ];
     };
+    podman.enable = true;
     tablet.enable = false;
     sound = {
       enable = true;
diff --git a/machines/mimir/configuration.nix b/machines/mimir/configuration.nix
index c5f7dec..91fabd0 100644
--- a/machines/mimir/configuration.nix
+++ b/machines/mimir/configuration.nix
@@ -42,7 +42,7 @@
       enable = true;
       wayland = true;
     };
-    docker = {
+    podman = {
       enable = true;
       enableNvidia = true;
       # enableTcpSocket = true;
diff --git a/modules/docker/default.nix b/modules/docker/default.nix
index 2a3f0d0..cc7db6e 100644
--- a/modules/docker/default.nix
+++ b/modules/docker/default.nix
@@ -4,17 +4,16 @@
 , ...
 }:
 with lib; let
-  cfg = config.eboskma.docker;
+  cfg = config.eboskma.podman;
 in
 {
-  options.eboskma.docker = {
-    enable = mkEnableOption "docker";
-    enableNvidia = mkEnableOption "docker NVidia support";
-    # enableTcpSocket = mkEnableOption "docker TCP socket";
+  options.eboskma.podman = {
+    enable = mkEnableOption "podman";
+    enableNvidia = mkEnableOption "podman NVidia support";
+    # enableTcpSocket = mkEnableOption "podman TCP socket";
   };
 
   config = mkIf cfg.enable {
-    # environment.systemPackages = with pkgs; [ docker-compose ];
     environment.systemPackages = [ pkgs.podman-compose pkgs.netavark ];
 
     virtualisation.podman = {
@@ -27,12 +26,6 @@ in
         dates = "weekly";
       };
 
-      # daemon.settings = {
-      #   insecure-registries = config.virtualisation.containers.registries.insecure;
-      #   features = {
-      #     buildkit = true;
-      #   };
-      # };
       defaultNetwork.settings.dns_enable = true;
 
     };
@@ -52,13 +45,17 @@ in
             "${pkgs.podman}/libexec/podman"
           ];
         };
+        containers = {
+          log_driver = "k8s-file";
+          events_logger = "journald";
+        };
       };
     };
 
-    users.extraUsers.${config.eboskma.var.mainUser}.extraGroups = [ "docker" "podman" ];
+    users.extraUsers.${config.eboskma.var.mainUser}.extraGroups = [ "podman" ];
 
     # Make DNS work in containers
-    networking.firewall.interfaces."podman+" = {
+    networking.firewall.interfaces."podman*" = {
       allowedUDPPorts = [ 53 ];
       allowedTCPPorts = [ 53 ];
     };
diff --git a/modules/element-web/default.nix b/modules/element-web/default.nix
index d4de74f..056262c 100644
--- a/modules/element-web/default.nix
+++ b/modules/element-web/default.nix
@@ -11,7 +11,7 @@ in
   options.eboskma.element-web = { enable = mkEnableOption "activate element-web"; };
 
   config = mkIf cfg.enable {
-    eboskma.docker.enable = true;
+    eboskma.podman.enable = true;
 
     virtualisation.oci-containers.containers = {
       element-web = {
diff --git a/modules/livebook/default.nix b/modules/livebook/default.nix
index 4a63adc..5270222 100644
--- a/modules/livebook/default.nix
+++ b/modules/livebook/default.nix
@@ -19,7 +19,7 @@ in
   };
 
   config = mkIf cfg.enable {
-    eboskma.docker.enable = true;
+    eboskma.podman.enable = true;
 
     virtualisation.oci-containers.containers = {
       livebook = {