diff --git a/.gitignore b/.gitignore
index 4687a2b..9ca6f6b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
+# macOS metadata
+**/.DS_Store
+
 # Binaries for programs and plugins
 *.exe
 *.exe~
diff --git a/README.md b/README.md
index 1637fe5..4b91570 100644
--- a/README.md
+++ b/README.md
@@ -93,7 +93,7 @@ RESULTS:
 Deprecated APIs:
 PodSecurityPolicy found in policy/v1beta1
 	 ├─ Deprecated at: 1.21
-	 ├─ PodSecurityPolicy governs the ability to make requests that affect the Security Contextthat will be applied to a pod and container.Deprecated in 1.21.
+	 ├─ PodSecurityPolicy governs the ability to make requests that affect the Security Context that will be applied to a pod and container. Deprecated in 1.21.
 		-> OBJECT: restrictive namespace: default
 
 Deleted APIs:
diff --git a/docs/database.md b/docs/database.md
index 3d81b35..81ed7d1 100644
--- a/docs/database.md
+++ b/docs/database.md
@@ -7,11 +7,11 @@ It can be downloaded from [here](https://kubepug.xyz/data/data.json).
 ## Generating my own database
 
 In case you want to generate your own data.json file, follow the steps below. 
-We use a [container image](https://github.com/rikatz/kubepug/blob/main/generator/Dockerfile) so the whole step can be reproduced locally.
+We use a [container image](https://github.com/nudgebee/kubepug/blob/main/generator/Dockerfile) so the whole step can be reproduced locally.
  
 1. Clone/Download this repository, and build the container on `generator/` directory
   ```console
-  git clone https://github.com/rikatz/kubepug
+  git clone https://github.com/nudgebee/kubepug
   docker build -t generator -f generator/Dockerfile generator
   ```
 1. Generate the data.json
diff --git a/docs/install.md b/docs/install.md
index 4945de5..f58ff3e 100644
--- a/docs/install.md
+++ b/docs/install.md
@@ -9,7 +9,7 @@ Kubepug can be installed in some different ways:
 !!! info "Additional installation methods"
 
     If you want an installation method that is not supported yet, feel free to
-    open an issue on the [github project](https://github.com/rikatz/kubepug) asking for the new method.
+    open an issue on the [github project](https://github.com/nudgebee/kubepug) asking for the new method.
     No promises! But we will do our best to support it!
 
 ## Krew plugin
@@ -36,7 +36,7 @@ sudo snap install kubepug --edge
 ## Getting the binary
 Kubepug is compiled as a binary for various Operational Systems and architectures. 
 
-You can get the latest release from [the Release page](https://github.com/rikatz/kubepug/releases/latest)
+You can get the latest release from [the Release page](https://github.com/nudgebee/kubepug/releases/latest)
 
 ## Github Action
 Kubepug can be used as a Github Action with the following definition:
diff --git a/snapcraft.yaml b/snapcraft.yaml
deleted file mode 100644
index 4abe8fe..0000000
--- a/snapcraft.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
-name: kubepug
-base: core20
-summary: CLI to verify Kubernetes manifests and clusters on deprecated APIs
-description: |
-  Kubepug is a CLI and kubectl plugin, that can verify if a Kubernetes cluster or Kubernetes manifests contains deprecated and deleted APIs.
-  It can check against a specific Kubernetes version, and depending on the API propose a replacement API
-grade: stable
-confinement: strict
-adopt-info: kubepug
-
-architectures:
-- amd64
-- arm64
-- armhf
-
-apps:
-  kubepug:
-    command: bin/kubepug
-    plugs:
-      - home
-      - network
-parts:
-  kubepug:
-    plugin: go
-    source-type: git
-    source: https://github.com/kubepug/kubepug
-    override-pull: |
-      snapcraftctl pull
-      last_committed_tag="$(git describe --tags --abbrev=0)"
-      last_committed_tag_ver="$(echo ${last_committed_tag} | sed 's/v//')"
-      last_released_tag="$(snap info kubepug | awk '$1 == "latest/beta:" { print $2 }')"
-      # If the latest tag from the upstream project has not been released to
-      # beta, build that tag instead of master.
-      if [ "${last_committed_tag_ver}" != "${last_released_tag}" ]; then
-        git fetch
-        git checkout "${last_committed_tag}"
-      fi
-      snapcraftctl set-version "$(git describe --tags | sed 's/v//')"
-    build-packages:
-      - git
-      - sed