diff --git a/.github/workflows/push-image.yml b/.github/workflows/push-image.yml
index 770cb43..6e66ceb 100644
--- a/.github/workflows/push-image.yml
+++ b/.github/workflows/push-image.yml
@@ -9,13 +9,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-      with:
-        fetch-depth: 2
-    - run: git checkout HEAD^
     - uses: whoan/docker-build-with-cache-action@v5
       with:
-        image_name: joshuasbrown/cpp-py-formatter
+        registry: ghcr.io
+        image_name: cpp-py-formatter
         image_tag: latest
-        username: ${{ secrets.DOCKER_USER }}
-        password: ${{ secrets.DOCKER_TOKEN }}
+        username: pgrete
+        password: ${{ secrets.GHCR_TOKEN }}
         push_git_tag: true
diff --git a/Cargo.toml b/Cargo.toml
index 48af1b4..d982f59 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "cpp-py-format"
-version = "0.2.3"
-authors = ["Andrew Gaspar <andrew.gaspar@outlook.com>","Joshua Brown <joshbro42867@yahoo.com>"]
+version = "0.3.0"
+authors = ["Andrew Gaspar <andrew.gaspar@outlook.com>","Joshua Brown <joshbro42867@yahoo.com>", "Philipp Grete <pgrete@hs.uni-hamburg.de"]
 edition = "2018"
 
 [dependencies]
diff --git a/Dockerfile b/Dockerfile
index c342e15..c25222e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # Build the GitHub Action
-FROM rust:1.42 as builder
+FROM rust:1.52 as builder
 WORKDIR /usr/src/myapp
 COPY Cargo.toml .
 COPY Cargo.lock .
@@ -7,16 +7,18 @@ COPY src ./src
 RUN cargo install --path .
 
 # GitHub Action Image
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 # Install our apt packages
 RUN apt-get update
 RUN apt-get upgrade -y
-RUN apt-get install -y git
-RUN apt-get install -y python3-pip
+RUN apt-get install -y git \
+  python3-pip \
+  clang-format-10 clang-format-11 clang-format-12 \
+  && rm -rf /var/lib/apt/lists/*
 RUN python3 -m pip install --upgrade pip
 RUN python3 -m pip install black
 
-# Install clang-formats
-ADD ./clang-format /clang-format
+COPY gitconfig /etc
+
 COPY --from=builder /usr/local/cargo/bin/cpp-py-format /cpp-py-format
 ENTRYPOINT [ "/cpp-py-format" ]
diff --git a/check/action.yml b/check/action.yml
index c1d6a01..7c7897b 100644
--- a/check/action.yml
+++ b/check/action.yml
@@ -9,9 +9,9 @@ inputs:
     required: true
   clangFormatVersion:
     description:
-      Major Clang Version number. Supports clang 5 to 10. Default 10
+      Major Clang Version number. Supports clang 10 to 12. Default 12
     required: false
-    default: '10'
+    default: '12'
   include_c:
     description:
       Comma-separated list of file globs (e.g '**/*.cpp,**/*.hpp') that
@@ -34,7 +34,7 @@ inputs:
     default: '""'
 runs:
   using: 'docker'
-  image: docker://joshuasbrown/cpp-py-formatter:latest
+  image: docker://ghcr.io/pgrete/cpp-py-formatter:latest
   args:
   - --github-token
   - ${{ inputs.token }}
diff --git a/clang-format/clang-format-10 b/clang-format/clang-format-10
deleted file mode 100755
index c3b9422..0000000
Binary files a/clang-format/clang-format-10 and /dev/null differ
diff --git a/clang-format/clang-format-5 b/clang-format/clang-format-5
deleted file mode 100755
index ba089e7..0000000
Binary files a/clang-format/clang-format-5 and /dev/null differ
diff --git a/clang-format/clang-format-6 b/clang-format/clang-format-6
deleted file mode 100755
index 6950543..0000000
Binary files a/clang-format/clang-format-6 and /dev/null differ
diff --git a/clang-format/clang-format-7 b/clang-format/clang-format-7
deleted file mode 100755
index 54b0348..0000000
Binary files a/clang-format/clang-format-7 and /dev/null differ
diff --git a/clang-format/clang-format-8 b/clang-format/clang-format-8
deleted file mode 100755
index dcaa3cc..0000000
Binary files a/clang-format/clang-format-8 and /dev/null differ
diff --git a/clang-format/clang-format-9 b/clang-format/clang-format-9
deleted file mode 100755
index 8f16ef0..0000000
Binary files a/clang-format/clang-format-9 and /dev/null differ
diff --git a/command/action.yml b/command/action.yml
index 8bc1a59..3efd79e 100644
--- a/command/action.yml
+++ b/command/action.yml
@@ -9,9 +9,9 @@ inputs:
     required: true
   clangFormatVersion:
     description:
-      Major Clang Version number. Supports clang 5 to 10. Default 10
+      Major Clang Version number. Supports clang 10 to 12. Default 12
     required: false
-    default: '10'
+    default: '12'
   include_c:
     description:
       Comma-separated list of file globs (e.g '**/*.cpp,**/*.hpp') that
@@ -40,7 +40,7 @@ inputs:
     default: 'cpp-py-formatter'
 runs:
   using: 'docker'
-  image: docker://joshuasbrown/cpp-py-formatter:latest
+  image: docker://ghcr.io/pgrete/cpp-py-formatter:latest
   args:
   - --github-token
   - ${{ inputs.token }}
diff --git a/gitconfig b/gitconfig
new file mode 100644
index 0000000..1220e10
--- /dev/null
+++ b/gitconfig
@@ -0,0 +1,2 @@
+[safe]
+    directory = *
diff --git a/src/main.rs b/src/main.rs
index ca79a7c..4e8d455 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -41,7 +41,7 @@ struct App {
 impl App {
     fn run() -> Result<(), Box<dyn Error>> {
         let matches = clap::App::new("cpp-py-format")
-            .author("Andrew Gaspar <andrew.gaspar@outlook.com>, Joshua Brown <joshbro42867@yahoo.com")
+            .author("Andrew Gaspar <andrew.gaspar@outlook.com>, Joshua Brown <joshbro42867@yahoo.com, Philipp Grete <pgrete@hs.uni-hamburg.de>")
             .about("Runner code for executing clang-format, and black")
             .arg(
                 Arg::with_name("github-token")
@@ -53,7 +53,7 @@ impl App {
                 Arg::with_name("clang-format-version")
                     .long("clang-format-version")
                     .takes_value(true)
-                    .default_value("10")
+                    .default_value("13")
                     .conflicts_with("clang-format-override"),
             )
             .arg(
@@ -106,7 +106,7 @@ impl App {
             if let Some(clang_format_override) = matches.value_of("clang-format-override") {
                 clang_format_override.into()
             } else if env::var("GITHUB_ACTION").is_ok() {
-                format!("/clang-format/clang-format-{}", clang_format_version).into()
+                format!("/usr/bin/clang-format-{}", clang_format_version).into()
             } else {
                 String::from_utf8(
                     Command::new("which")