diff --git a/conf.d/git.bbaovanc.com b/conf.d/git.bbaovanc.com
index d202b4f..39204a7 100644
--- a/conf.d/git.bbaovanc.com
+++ b/conf.d/git.bbaovanc.com
@@ -16,7 +16,9 @@ git.bbaovanc.com {
             @404 status 404
             handle_response @404 {
                 handle /bbaovanc/* {
-                    redir https://github.com{uri} permanent
+                    root * /etc/caddy/github-redirect/
+                    rewrite * /index.php?uri={uri}
+                    php_fastcgi unix//run/php/php-fpm.sock
                 }
 
                 handle {
diff --git a/github-redirect/index.php b/github-redirect/index.php
new file mode 100644
index 0000000..38163b6
--- /dev/null
+++ b/github-redirect/index.php
@@ -0,0 +1,7 @@
+<?php
+    $uri = $_GET["uri"];
+    $uri = preg_replace('/(\/bbaovanc\/.*?(?=\/))\/src\/(commit|branch)/', '$1/blob', $uri);
+    $uri = preg_replace('/(\/bbaovanc\/.*?(?=\/))\/(commits|blame)\/(branch|commit)/', '$1/$2', $uri);
+    header('Status: 301 Moved Permanently');
+    header('Location: https://github.com' . $uri);
+?>