diff --git a/server/extension/expected/90_remove_geocoder_api_user_test.out b/server/extension/expected/90_remove_geocoder_api_user_test.out
new file mode 100644
index 0000000..c53fcfc
--- /dev/null
+++ b/server/extension/expected/90_remove_geocoder_api_user_test.out
@@ -0,0 +1,5 @@
+REVOKE EXECUTE ON ALL FUNCTIONS IN SCHEMA cdb_geocoder_server FROM geocoder_api;
+REVOKE EXECUTE ON ALL FUNCTIONS IN SCHEMA public FROM geocoder_api;
+REVOKE USAGE ON SCHEMA cdb_geocoder_server FROM geocoder_api;
+REVOKE USAGE ON SCHEMA public FROM geocoder_api;
+REVOKE SELECT ON ALL TABLES IN SCHEMA public FROM geocoder_api;
diff --git a/server/extension/sql/0.0.1/90_geocoder_server_user.sql b/server/extension/sql/0.0.1/90_geocoder_server_user.sql
new file mode 100644
index 0000000..3c2b354
--- /dev/null
+++ b/server/extension/sql/0.0.1/90_geocoder_server_user.sql
@@ -0,0 +1,15 @@
+DO $$
+BEGIN
+    IF NOT EXISTS (
+        SELECT *
+        FROM   pg_catalog.pg_user
+        WHERE  usename = 'geocoder_api') THEN
+
+            CREATE USER geocoder_api;
+    END IF;
+    GRANT EXECUTE ON ALL FUNCTIONS IN SCHEMA cdb_geocoder_server TO geocoder_api;
+    GRANT EXECUTE ON ALL FUNCTIONS IN SCHEMA public TO geocoder_api;
+    GRANT USAGE ON SCHEMA cdb_geocoder_server TO geocoder_api;
+    GRANT USAGE ON SCHEMA public TO geocoder_api;
+    GRANT SELECT ON ALL TABLES IN SCHEMA public TO geocoder_api;
+END$$;
\ No newline at end of file
diff --git a/server/extension/sql/90_remove_geocoder_api_user_test.sql b/server/extension/sql/90_remove_geocoder_api_user_test.sql
new file mode 100644
index 0000000..4efb88e
--- /dev/null
+++ b/server/extension/sql/90_remove_geocoder_api_user_test.sql
@@ -0,0 +1,5 @@
+REVOKE EXECUTE ON ALL FUNCTIONS IN SCHEMA cdb_geocoder_server FROM geocoder_api;
+REVOKE EXECUTE ON ALL FUNCTIONS IN SCHEMA public FROM geocoder_api;
+REVOKE USAGE ON SCHEMA cdb_geocoder_server FROM geocoder_api;
+REVOKE USAGE ON SCHEMA public FROM geocoder_api;
+REVOKE SELECT ON ALL TABLES IN SCHEMA public FROM geocoder_api;
\ No newline at end of file