diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index d2b0c8920..a071d116f 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -40,12 +40,15 @@ jobs:
         with:
           images: ghcr.io/${{ github.repository_owner }}/${{ github.event.repository.name }}
           flavor: |
-            suffix=${{ github.ref == 'refs/heads/main' && github.event_name == 'push' && matrix.build.suffix || '' }}
+            suffix=${{ matrix.build.suffix }}
+            latest=${{ github.ref == 'refs/heads/main' && github.event_name == 'push' && 'false' || 'auto' }}
           tags: |
-            type=sha,format=short
-            type=semver,pattern={{version}}
-            type=semver,pattern={{raw}}
-            type=raw,value=latest,enable=${{ github.ref == 'refs/heads/main' && github.event_name == 'push' }}
+            type=sha,format=short,suffix=${{ matrix.build.suffix }},enable=${{ github.ref == 'refs/heads/main' && github.event_name == 'push' }}
+            type=raw,value=latest,suffix=${{ matrix.build.suffix }},enable=${{ github.ref == 'refs/heads/main' && github.event_name == 'push' }}
+            type=sha,format=short,enable=${{ !(github.ref == 'refs/heads/main' && github.event_name == 'push') }}
+            type=semver,pattern={{version}},enable=${{ !(github.ref == 'refs/heads/main' && github.event_name == 'push') }}
+            type=semver,pattern={{raw}},enable=${{ !(github.ref == 'refs/heads/main' && github.event_name == 'push') }}
+            type=raw,value=latest,enable=${{ !(github.ref == 'refs/heads/main' && github.event_name == 'push') }}
           labels: |
             org.opencontainers.image.url=${{ github.server_url }}/${{ github.repository }}
             org.opencontainers.image.source=${{ github.event.pull_request.html_url || github.event.repository.html_url }}
diff --git a/home-manager/programs/fish/default.nix b/home-manager/programs/fish/default.nix
index b35fc9f2c..3f005cd00 100644
--- a/home-manager/programs/fish/default.nix
+++ b/home-manager/programs/fish/default.nix
@@ -42,6 +42,7 @@
       cs = "claude-squad";
       cx = "codex exec";
       e = "nvim";
+      g = "git";
       ld = "lazydocker";
       lg = "lazygit";
       ta = "tmux new -A -s default";
diff --git a/home-manager/programs/fish/functions/_fish_user_key_bindings.fish b/home-manager/programs/fish/functions/_fish_user_key_bindings.fish
new file mode 100644
index 000000000..3d87de7ca
--- /dev/null
+++ b/home-manager/programs/fish/functions/_fish_user_key_bindings.fish
@@ -0,0 +1,4 @@
+function fish_user_key_bindings
+  # Exit vim insert mode with jj
+  bind -M insert -m default jj backward-char force-repaint
+end