diff --git a/compose/service/notification.go b/compose/service/notification.go
index 7dd409565..7665953c8 100644
--- a/compose/service/notification.go
+++ b/compose/service/notification.go
@@ -12,8 +12,8 @@ import (
 	"go.uber.org/zap/zapcore"
 	gomail "gopkg.in/mail.v2"
 
-	httpClient "github.com/cortezaproject/corteza-server/internal/http"
 	"github.com/cortezaproject/corteza-server/internal/mail"
+	httpClient "github.com/cortezaproject/corteza-server/pkg/http"
 	"github.com/cortezaproject/corteza-server/pkg/logger"
 )
 
diff --git a/internal/store/util.go b/internal/store/util.go
index e77d926f2..14600ad0b 100644
--- a/internal/store/util.go
+++ b/internal/store/util.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/cortezaproject/corteza-server/internal/http"
+	"github.com/cortezaproject/corteza-server/pkg/http"
 )
 
 func FromURL(fileURL string) (io.ReadCloser, error) {
diff --git a/messaging/service/service.go b/messaging/service/service.go
index 0d3d5a235..5c42ddf39 100644
--- a/messaging/service/service.go
+++ b/messaging/service/service.go
@@ -6,11 +6,11 @@ import (
 
 	"go.uber.org/zap"
 
-	"github.com/cortezaproject/corteza-server/internal/http"
 	"github.com/cortezaproject/corteza-server/internal/permissions"
 	"github.com/cortezaproject/corteza-server/internal/store"
 	"github.com/cortezaproject/corteza-server/messaging/repository"
 	"github.com/cortezaproject/corteza-server/pkg/cli/options"
+	"github.com/cortezaproject/corteza-server/pkg/http"
 )
 
 type (
diff --git a/messaging/service/webhook.go b/messaging/service/webhook.go
index 5f09774e2..c915acd46 100644
--- a/messaging/service/webhook.go
+++ b/messaging/service/webhook.go
@@ -12,11 +12,11 @@ import (
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
 
-	"github.com/cortezaproject/corteza-server/internal/http"
 	"github.com/cortezaproject/corteza-server/internal/store"
 	"github.com/cortezaproject/corteza-server/messaging/repository"
 	"github.com/cortezaproject/corteza-server/messaging/types"
 	"github.com/cortezaproject/corteza-server/pkg/auth"
+	"github.com/cortezaproject/corteza-server/pkg/http"
 	"github.com/cortezaproject/corteza-server/pkg/logger"
 )
 
diff --git a/messaging/service/webhook_test.go b/messaging/service/webhook_test.go
index e7df90a71..9d8d3a8e6 100644
--- a/messaging/service/webhook_test.go
+++ b/messaging/service/webhook_test.go
@@ -10,10 +10,10 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/cortezaproject/corteza-server/internal/http"
 	"github.com/cortezaproject/corteza-server/messaging/repository"
 	"github.com/cortezaproject/corteza-server/messaging/types"
 	"github.com/cortezaproject/corteza-server/pkg/auth"
+	"github.com/cortezaproject/corteza-server/pkg/http"
 )
 
 func TestOutgoingWebhook(t *testing.T) {
diff --git a/pkg/cli/helpers.go b/pkg/cli/helpers.go
index d6552595b..5087bb4c5 100644
--- a/pkg/cli/helpers.go
+++ b/pkg/cli/helpers.go
@@ -5,10 +5,10 @@ import (
 	"os"
 	"time"
 
-	"github.com/cortezaproject/corteza-server/internal/http"
 	"github.com/cortezaproject/corteza-server/internal/mail"
 	"github.com/cortezaproject/corteza-server/pkg/auth"
 	"github.com/cortezaproject/corteza-server/pkg/cli/options"
+	"github.com/cortezaproject/corteza-server/pkg/http"
 )
 
 func InitGeneralServices(smtpOpt *options.SMTPOpt, jwtOpt *options.JWTOpt, httpClientOpt *options.HttpClientOpt) {
diff --git a/internal/http/client.go b/pkg/http/client.go
similarity index 100%
rename from internal/http/client.go
rename to pkg/http/client.go
diff --git a/internal/http/client_fortune_test.go b/pkg/http/client_fortune_test.go
similarity index 100%
rename from internal/http/client_fortune_test.go
rename to pkg/http/client_fortune_test.go
diff --git a/internal/http/client_test.go b/pkg/http/client_test.go
similarity index 100%
rename from internal/http/client_test.go
rename to pkg/http/client_test.go
diff --git a/internal/http/default.go b/pkg/http/default.go
similarity index 100%
rename from internal/http/default.go
rename to pkg/http/default.go