diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
index 374cd701..e96591fe 100644
--- a/.github/workflows/docker.yaml
+++ b/.github/workflows/docker.yaml
@@ -6,10 +6,8 @@ on:
       - .github/workflows/docker.yaml
       - Dockerfile
       - go.*
-      - main.go
       - api/**
-      - controllers/**
-      - pkg/**
+      - internal/**
       - e2e_test/**
       - '!**/*_test.go'
       - '!**/*.md'
@@ -22,10 +20,8 @@ on:
       - .github/workflows/docker.yaml
       - Dockerfile
       - go.*
-      - main.go
       - api/**
-      - controllers/**
-      - pkg/**
+      - internal/**
       - e2e_test/**
       - '!**/*_test.go'
       - '!**/*.md'
diff --git a/Dockerfile b/Dockerfile
index 5dcc2042..cab2a5b9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,8 +14,7 @@ RUN go mod download
 # Copy the go source
 COPY cmd/main.go cmd/main.go
 COPY api/ api/
-COPY internal/controller/ internal/controller/
-COPY pkg/ pkg/
+COPY internal/ internal/
 
 # Build
 # the GOARCH has not a default value to allow the binary be built according to the host where the command
diff --git a/cmd/main.go b/cmd/main.go
index 0a5cbf06..903b6327 100644
--- a/cmd/main.go
+++ b/cmd/main.go
@@ -37,8 +37,8 @@ import (
 
 	argocdcommenterv1 "github.com/int128/argocd-commenter/api/v1"
 	"github.com/int128/argocd-commenter/internal/controller"
-	"github.com/int128/argocd-commenter/pkg/github"
-	"github.com/int128/argocd-commenter/pkg/notification"
+	"github.com/int128/argocd-commenter/internal/github"
+	"github.com/int128/argocd-commenter/internal/notification"
 	//+kubebuilder:scaffold:imports
 )
 
diff --git a/pkg/argocd/application.go b/internal/argocd/application.go
similarity index 100%
rename from pkg/argocd/application.go
rename to internal/argocd/application.go
diff --git a/pkg/argocd/configmap.go b/internal/argocd/configmap.go
similarity index 100%
rename from pkg/argocd/configmap.go
rename to internal/argocd/configmap.go
diff --git a/internal/controller/applicationdeletiondeployment_controller.go b/internal/controller/applicationdeletiondeployment_controller.go
index 22e00ad1..77c4d70e 100644
--- a/internal/controller/applicationdeletiondeployment_controller.go
+++ b/internal/controller/applicationdeletiondeployment_controller.go
@@ -21,9 +21,9 @@ import (
 
 	argocdv1alpha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
 	"github.com/argoproj/gitops-engine/pkg/health"
+	"github.com/int128/argocd-commenter/internal/argocd"
 	"github.com/int128/argocd-commenter/internal/controller/predicates"
-	"github.com/int128/argocd-commenter/pkg/argocd"
-	"github.com/int128/argocd-commenter/pkg/notification"
+	"github.com/int128/argocd-commenter/internal/notification"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/tools/record"
diff --git a/internal/controller/applicationhealthcomment_controller.go b/internal/controller/applicationhealthcomment_controller.go
index 2c9529d0..90d4be63 100644
--- a/internal/controller/applicationhealthcomment_controller.go
+++ b/internal/controller/applicationhealthcomment_controller.go
@@ -22,9 +22,9 @@ import (
 	argocdv1alpha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
 	"github.com/argoproj/gitops-engine/pkg/health"
 	argocdcommenterv1 "github.com/int128/argocd-commenter/api/v1"
+	"github.com/int128/argocd-commenter/internal/argocd"
 	"github.com/int128/argocd-commenter/internal/controller/predicates"
-	"github.com/int128/argocd-commenter/pkg/argocd"
-	"github.com/int128/argocd-commenter/pkg/notification"
+	"github.com/int128/argocd-commenter/internal/notification"
 	corev1 "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
diff --git a/internal/controller/applicationhealthdeployment_controller.go b/internal/controller/applicationhealthdeployment_controller.go
index 2fbc50c7..7885d62f 100644
--- a/internal/controller/applicationhealthdeployment_controller.go
+++ b/internal/controller/applicationhealthdeployment_controller.go
@@ -22,9 +22,9 @@ import (
 
 	argocdv1alpha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
 	"github.com/argoproj/gitops-engine/pkg/health"
+	"github.com/int128/argocd-commenter/internal/argocd"
 	"github.com/int128/argocd-commenter/internal/controller/predicates"
-	"github.com/int128/argocd-commenter/pkg/argocd"
-	"github.com/int128/argocd-commenter/pkg/notification"
+	"github.com/int128/argocd-commenter/internal/notification"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/tools/record"
diff --git a/internal/controller/applicationphasecomment_controller.go b/internal/controller/applicationphasecomment_controller.go
index e45c97db..0a628ec0 100644
--- a/internal/controller/applicationphasecomment_controller.go
+++ b/internal/controller/applicationphasecomment_controller.go
@@ -21,9 +21,9 @@ import (
 
 	argocdv1alpha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
 	synccommon "github.com/argoproj/gitops-engine/pkg/sync/common"
+	"github.com/int128/argocd-commenter/internal/argocd"
 	"github.com/int128/argocd-commenter/internal/controller/predicates"
-	"github.com/int128/argocd-commenter/pkg/argocd"
-	"github.com/int128/argocd-commenter/pkg/notification"
+	"github.com/int128/argocd-commenter/internal/notification"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/tools/record"
diff --git a/internal/controller/applicationphasedeployment_controller.go b/internal/controller/applicationphasedeployment_controller.go
index f5d2c781..ab62c71b 100644
--- a/internal/controller/applicationphasedeployment_controller.go
+++ b/internal/controller/applicationphasedeployment_controller.go
@@ -22,9 +22,9 @@ import (
 
 	argocdv1alpha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
 	synccommon "github.com/argoproj/gitops-engine/pkg/sync/common"
+	"github.com/int128/argocd-commenter/internal/argocd"
 	"github.com/int128/argocd-commenter/internal/controller/predicates"
-	"github.com/int128/argocd-commenter/pkg/argocd"
-	"github.com/int128/argocd-commenter/pkg/notification"
+	"github.com/int128/argocd-commenter/internal/notification"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/tools/record"
diff --git a/internal/controller/suite_test.go b/internal/controller/suite_test.go
index 97a28515..dd3ad3f3 100644
--- a/internal/controller/suite_test.go
+++ b/internal/controller/suite_test.go
@@ -25,8 +25,8 @@ import (
 	"time"
 
 	argocdv1alpha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
-	"github.com/int128/argocd-commenter/pkg/github"
-	"github.com/int128/argocd-commenter/pkg/notification"
+	"github.com/int128/argocd-commenter/internal/github"
+	"github.com/int128/argocd-commenter/internal/notification"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"go.uber.org/zap/zapcore"
diff --git a/pkg/github/client.go b/internal/github/client.go
similarity index 100%
rename from pkg/github/client.go
rename to internal/github/client.go
diff --git a/pkg/github/comment.go b/internal/github/comment.go
similarity index 100%
rename from pkg/github/comment.go
rename to internal/github/comment.go
diff --git a/pkg/github/deployment.go b/internal/github/deployment.go
similarity index 100%
rename from pkg/github/deployment.go
rename to internal/github/deployment.go
diff --git a/pkg/github/deployment_test.go b/internal/github/deployment_test.go
similarity index 100%
rename from pkg/github/deployment_test.go
rename to internal/github/deployment_test.go
diff --git a/pkg/github/pull.go b/internal/github/pull.go
similarity index 100%
rename from pkg/github/pull.go
rename to internal/github/pull.go
diff --git a/pkg/github/types.go b/internal/github/types.go
similarity index 100%
rename from pkg/github/types.go
rename to internal/github/types.go
diff --git a/pkg/github/types_test.go b/internal/github/types_test.go
similarity index 100%
rename from pkg/github/types_test.go
rename to internal/github/types_test.go
diff --git a/pkg/notification/comment.go b/internal/notification/comment.go
similarity index 97%
rename from pkg/notification/comment.go
rename to internal/notification/comment.go
index 3c33ce8b..cabbfa18 100644
--- a/pkg/notification/comment.go
+++ b/internal/notification/comment.go
@@ -9,8 +9,8 @@ import (
 	"github.com/argoproj/gitops-engine/pkg/health"
 	synccommon "github.com/argoproj/gitops-engine/pkg/sync/common"
 	"github.com/go-logr/logr"
-	"github.com/int128/argocd-commenter/pkg/argocd"
-	"github.com/int128/argocd-commenter/pkg/github"
+	"github.com/int128/argocd-commenter/internal/argocd"
+	"github.com/int128/argocd-commenter/internal/github"
 	"k8s.io/apimachinery/pkg/util/errors"
 )
 
diff --git a/pkg/notification/deployment.go b/internal/notification/deployment.go
similarity index 97%
rename from pkg/notification/deployment.go
rename to internal/notification/deployment.go
index c3a03c14..5d32a908 100644
--- a/pkg/notification/deployment.go
+++ b/internal/notification/deployment.go
@@ -8,8 +8,8 @@ import (
 	"github.com/argoproj/gitops-engine/pkg/health"
 	synccommon "github.com/argoproj/gitops-engine/pkg/sync/common"
 	"github.com/go-logr/logr"
-	"github.com/int128/argocd-commenter/pkg/argocd"
-	"github.com/int128/argocd-commenter/pkg/github"
+	"github.com/int128/argocd-commenter/internal/argocd"
+	"github.com/int128/argocd-commenter/internal/github"
 )
 
 type DeploymentStatus struct {
diff --git a/pkg/notification/pull.go b/internal/notification/pull.go
similarity index 97%
rename from pkg/notification/pull.go
rename to internal/notification/pull.go
index 91b3e921..46ddc705 100644
--- a/pkg/notification/pull.go
+++ b/internal/notification/pull.go
@@ -5,7 +5,7 @@ import (
 	"strings"
 
 	argocdv1alpha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
-	"github.com/int128/argocd-commenter/pkg/github"
+	"github.com/int128/argocd-commenter/internal/github"
 )
 
 func filterPullRequestsRelatedToEvent(pulls []github.PullRequest, app argocdv1alpha1.Application) []int {
diff --git a/pkg/notification/pull_test.go b/internal/notification/pull_test.go
similarity index 100%
rename from pkg/notification/pull_test.go
rename to internal/notification/pull_test.go
diff --git a/pkg/notification/types.go b/internal/notification/types.go
similarity index 91%
rename from pkg/notification/types.go
rename to internal/notification/types.go
index bdb462dc..7c483d01 100644
--- a/pkg/notification/types.go
+++ b/internal/notification/types.go
@@ -4,7 +4,7 @@ import (
 	"context"
 
 	argocdv1alpha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
-	"github.com/int128/argocd-commenter/pkg/github"
+	"github.com/int128/argocd-commenter/internal/github"
 )
 
 type Client interface {