diff --git a/app-config.yaml b/app-config.yaml
index ab68d4398f..ae3df6be8d 100644
--- a/app-config.yaml
+++ b/app-config.yaml
@@ -29,9 +29,9 @@ backend:
   # auth:
   #   keys:
   #     - secret: ${BACKEND_SECRET}
-  baseUrl: http://localhost:7007
+  baseUrl: http://localhost:7000
   listen:
-    port: 7007
+    port: 7000
   database:
     client: sqlite3
     connection: ':memory:'
@@ -308,8 +308,8 @@ auth:
   providers:
     google:
       development:
-        clientId: ${AUTH_GOOGLE_CLIENT_ID}
-        clientSecret: ${AUTH_GOOGLE_CLIENT_SECRET}
+        clientId: 37202476686-4n78svmvctk411cirj7ds3d9ah682l2g.apps.googleusercontent.com
+        clientSecret: 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
     github:
       development:
         clientId: ${AUTH_GITHUB_CLIENT_ID}
diff --git a/packages/app/package.json b/packages/app/package.json
index 492ca8e900..1c9f199a8f 100644
--- a/packages/app/package.json
+++ b/packages/app/package.json
@@ -29,7 +29,7 @@
     "@backstage/plugin-code-coverage": "^0.1.27",
     "@backstage/plugin-cost-insights": "^0.11.22",
     "@backstage/plugin-explore": "^0.3.31",
-    "@backstage/plugin-gcalendar-homepage": "^0.0.0",
+    "@backstage/plugin-gcalendar": "^0.1.0",
     "@backstage/plugin-gcp-projects": "^0.3.19",
     "@backstage/plugin-github-actions": "^0.5.0",
     "@backstage/plugin-gocd": "^0.1.6",
diff --git a/packages/app/src/apis.ts b/packages/app/src/apis.ts
index 628cceff20..560b4c775d 100644
--- a/packages/app/src/apis.ts
+++ b/packages/app/src/apis.ts
@@ -39,7 +39,7 @@ import {
 import {
   GCalendarApiClient,
   gcalendarApiRef,
-} from '@backstage/plugin-gcalendar-homepage';
+} from '@backstage/plugin-gcalendar';
 
 export const apis: AnyApiFactory[] = [
   createApiFactory({
diff --git a/packages/app/src/components/home/HomePage.tsx b/packages/app/src/components/home/HomePage.tsx
index 4e83920121..9f8c130e2b 100644
--- a/packages/app/src/components/home/HomePage.tsx
+++ b/packages/app/src/components/home/HomePage.tsx
@@ -25,7 +25,7 @@ import {
 } from '@backstage/plugin-home';
 import { Content, Header, Page } from '@backstage/core-components';
 import { HomePageSearchBar } from '@backstage/plugin-search';
-import { CalendarCard } from '@backstage/plugin-gcalendar-homepage';
+import { CalendarCard } from '@backstage/plugin-gcalendar';
 import Grid from '@material-ui/core/Grid';
 import React from 'react';
 
diff --git a/plugins/gcalendar-homepage/.eslintrc.js b/plugins/gcalendar/.eslintrc.js
similarity index 100%
rename from plugins/gcalendar-homepage/.eslintrc.js
rename to plugins/gcalendar/.eslintrc.js
diff --git a/plugins/gcalendar-homepage/README.md b/plugins/gcalendar/README.md
similarity index 100%
rename from plugins/gcalendar-homepage/README.md
rename to plugins/gcalendar/README.md
diff --git a/plugins/gcalendar-homepage/dev/index.tsx b/plugins/gcalendar/dev/index.tsx
similarity index 84%
rename from plugins/gcalendar-homepage/dev/index.tsx
rename to plugins/gcalendar/dev/index.tsx
index 1fd27d507d..50d3ede0ff 100644
--- a/plugins/gcalendar-homepage/dev/index.tsx
+++ b/plugins/gcalendar/dev/index.tsx
@@ -14,6 +14,6 @@
  * limitations under the License.
  */
 import { createDevApp } from '@backstage/dev-utils';
-import { gcalendarHomepagePlugin } from '../src/plugin';
+import { gcalendarPlugin } from '../src/plugin';
 
-createDevApp().registerPlugin(gcalendarHomepagePlugin).render();
+createDevApp().registerPlugin(gcalendarPlugin).render();
diff --git a/plugins/gcalendar-homepage/package.json b/plugins/gcalendar/package.json
similarity index 96%
rename from plugins/gcalendar-homepage/package.json
rename to plugins/gcalendar/package.json
index 5d7b3dd871..7a7420b2f3 100644
--- a/plugins/gcalendar-homepage/package.json
+++ b/plugins/gcalendar/package.json
@@ -1,6 +1,6 @@
 {
-  "name": "@backstage/plugin-gcalendar-homepage",
-  "version": "0.0.0",
+  "name": "@backstage/plugin-gcalendar",
+  "version": "0.1.0",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
diff --git a/plugins/gcalendar-homepage/src/api/index.ts b/plugins/gcalendar/src/api/index.ts
similarity index 100%
rename from plugins/gcalendar-homepage/src/api/index.ts
rename to plugins/gcalendar/src/api/index.ts
diff --git a/plugins/gcalendar-homepage/src/components/CalendarCard/AttendeeChip.test.tsx b/plugins/gcalendar/src/components/CalendarCard/AttendeeChip.test.tsx
similarity index 100%
rename from plugins/gcalendar-homepage/src/components/CalendarCard/AttendeeChip.test.tsx
rename to plugins/gcalendar/src/components/CalendarCard/AttendeeChip.test.tsx
diff --git a/plugins/gcalendar-homepage/src/components/CalendarCard/AttendeeChip.tsx b/plugins/gcalendar/src/components/CalendarCard/AttendeeChip.tsx
similarity index 100%
rename from plugins/gcalendar-homepage/src/components/CalendarCard/AttendeeChip.tsx
rename to plugins/gcalendar/src/components/CalendarCard/AttendeeChip.tsx
diff --git a/plugins/gcalendar-homepage/src/components/CalendarCard/CalendarCard.test.tsx b/plugins/gcalendar/src/components/CalendarCard/CalendarCard.test.tsx
similarity index 97%
rename from plugins/gcalendar-homepage/src/components/CalendarCard/CalendarCard.test.tsx
rename to plugins/gcalendar/src/components/CalendarCard/CalendarCard.test.tsx
index 1b53d329d5..a9ac46982a 100644
--- a/plugins/gcalendar-homepage/src/components/CalendarCard/CalendarCard.test.tsx
+++ b/plugins/gcalendar/src/components/CalendarCard/CalendarCard.test.tsx
@@ -23,7 +23,7 @@ import {
 } from '@backstage/test-utils';
 
 import { CalendarCardContainer } from '.';
-import { gcalendarApiRef, gcalendarHomepagePlugin } from '../..';
+import { gcalendarApiRef, gcalendarPlugin } from '../..';
 
 describe('<CalendarCard />', () => {
   const primaryCalendar = {
@@ -130,7 +130,7 @@ describe('<CalendarCard />', () => {
 
   it('should select stored calendar', async () => {
     mockStorage
-      .forBucket(gcalendarHomepagePlugin.getId())
+      .forBucket(gcalendarPlugin.getId())
       .set('google_calendars_selected', [nonPrimaryCalendar.id]);
 
     const rendered = await renderInTestApp(
diff --git a/plugins/gcalendar-homepage/src/components/CalendarCard/CalendarCard.tsx b/plugins/gcalendar/src/components/CalendarCard/CalendarCard.tsx
similarity index 100%
rename from plugins/gcalendar-homepage/src/components/CalendarCard/CalendarCard.tsx
rename to plugins/gcalendar/src/components/CalendarCard/CalendarCard.tsx
diff --git a/plugins/gcalendar-homepage/src/components/CalendarCard/CalendarCardContainer.tsx b/plugins/gcalendar/src/components/CalendarCard/CalendarCardContainer.tsx
similarity index 100%
rename from plugins/gcalendar-homepage/src/components/CalendarCard/CalendarCardContainer.tsx
rename to plugins/gcalendar/src/components/CalendarCard/CalendarCardContainer.tsx
diff --git a/plugins/gcalendar-homepage/src/components/CalendarCard/CalendarEvent.test.tsx b/plugins/gcalendar/src/components/CalendarCard/CalendarEvent.test.tsx
similarity index 100%
rename from plugins/gcalendar-homepage/src/components/CalendarCard/CalendarEvent.test.tsx
rename to plugins/gcalendar/src/components/CalendarCard/CalendarEvent.test.tsx
diff --git a/plugins/gcalendar-homepage/src/components/CalendarCard/CalendarEvent.tsx b/plugins/gcalendar/src/components/CalendarCard/CalendarEvent.tsx
similarity index 100%
rename from plugins/gcalendar-homepage/src/components/CalendarCard/CalendarEvent.tsx
rename to plugins/gcalendar/src/components/CalendarCard/CalendarEvent.tsx
diff --git a/plugins/gcalendar-homepage/src/components/CalendarCard/CalendarEventPopoverContent.test.tsx b/plugins/gcalendar/src/components/CalendarCard/CalendarEventPopoverContent.test.tsx
similarity index 100%
rename from plugins/gcalendar-homepage/src/components/CalendarCard/CalendarEventPopoverContent.test.tsx
rename to plugins/gcalendar/src/components/CalendarCard/CalendarEventPopoverContent.test.tsx
diff --git a/plugins/gcalendar-homepage/src/components/CalendarCard/CalendarEventPopoverContent.tsx b/plugins/gcalendar/src/components/CalendarCard/CalendarEventPopoverContent.tsx
similarity index 100%
rename from plugins/gcalendar-homepage/src/components/CalendarCard/CalendarEventPopoverContent.tsx
rename to plugins/gcalendar/src/components/CalendarCard/CalendarEventPopoverContent.tsx
diff --git a/plugins/gcalendar-homepage/src/components/CalendarCard/CalendarSelect.tsx b/plugins/gcalendar/src/components/CalendarCard/CalendarSelect.tsx
similarity index 100%
rename from plugins/gcalendar-homepage/src/components/CalendarCard/CalendarSelect.tsx
rename to plugins/gcalendar/src/components/CalendarCard/CalendarSelect.tsx
diff --git a/plugins/gcalendar-homepage/src/components/CalendarCard/SignInContent.tsx b/plugins/gcalendar/src/components/CalendarCard/SignInContent.tsx
similarity index 100%
rename from plugins/gcalendar-homepage/src/components/CalendarCard/SignInContent.tsx
rename to plugins/gcalendar/src/components/CalendarCard/SignInContent.tsx
diff --git a/plugins/gcalendar-homepage/src/components/CalendarCard/index.ts b/plugins/gcalendar/src/components/CalendarCard/index.ts
similarity index 100%
rename from plugins/gcalendar-homepage/src/components/CalendarCard/index.ts
rename to plugins/gcalendar/src/components/CalendarCard/index.ts
diff --git a/plugins/gcalendar-homepage/src/components/CalendarCard/signInEventMock.ts b/plugins/gcalendar/src/components/CalendarCard/signInEventMock.ts
similarity index 100%
rename from plugins/gcalendar-homepage/src/components/CalendarCard/signInEventMock.ts
rename to plugins/gcalendar/src/components/CalendarCard/signInEventMock.ts
diff --git a/plugins/gcalendar-homepage/src/components/CalendarCard/types.ts b/plugins/gcalendar/src/components/CalendarCard/types.ts
similarity index 100%
rename from plugins/gcalendar-homepage/src/components/CalendarCard/types.ts
rename to plugins/gcalendar/src/components/CalendarCard/types.ts
diff --git a/plugins/gcalendar-homepage/src/components/CalendarCard/util.ts b/plugins/gcalendar/src/components/CalendarCard/util.ts
similarity index 100%
rename from plugins/gcalendar-homepage/src/components/CalendarCard/util.ts
rename to plugins/gcalendar/src/components/CalendarCard/util.ts
diff --git a/plugins/gcalendar-homepage/src/hooks/index.ts b/plugins/gcalendar/src/hooks/index.ts
similarity index 100%
rename from plugins/gcalendar-homepage/src/hooks/index.ts
rename to plugins/gcalendar/src/hooks/index.ts
diff --git a/plugins/gcalendar-homepage/src/hooks/useCalendarsQuery.ts b/plugins/gcalendar/src/hooks/useCalendarsQuery.ts
similarity index 100%
rename from plugins/gcalendar-homepage/src/hooks/useCalendarsQuery.ts
rename to plugins/gcalendar/src/hooks/useCalendarsQuery.ts
diff --git a/plugins/gcalendar-homepage/src/hooks/useEventsQuery.ts b/plugins/gcalendar/src/hooks/useEventsQuery.ts
similarity index 100%
rename from plugins/gcalendar-homepage/src/hooks/useEventsQuery.ts
rename to plugins/gcalendar/src/hooks/useEventsQuery.ts
diff --git a/plugins/gcalendar-homepage/src/hooks/useSignIn.ts b/plugins/gcalendar/src/hooks/useSignIn.ts
similarity index 100%
rename from plugins/gcalendar-homepage/src/hooks/useSignIn.ts
rename to plugins/gcalendar/src/hooks/useSignIn.ts
diff --git a/plugins/gcalendar-homepage/src/hooks/useStoredCalendars.ts b/plugins/gcalendar/src/hooks/useStoredCalendars.ts
similarity index 92%
rename from plugins/gcalendar-homepage/src/hooks/useStoredCalendars.ts
rename to plugins/gcalendar/src/hooks/useStoredCalendars.ts
index 8c6b8c3f82..6a8cf59d6b 100644
--- a/plugins/gcalendar-homepage/src/hooks/useStoredCalendars.ts
+++ b/plugins/gcalendar/src/hooks/useStoredCalendars.ts
@@ -16,7 +16,7 @@
 import { useApi, storageApiRef } from '@backstage/core-plugin-api';
 import { useObservable } from 'react-use';
 
-import { gcalendarHomepagePlugin } from '../plugin';
+import { gcalendarPlugin } from '../plugin';
 
 export enum LocalStorageKeys {
   selectedCalendars = 'google_calendars_selected',
@@ -25,7 +25,7 @@ export enum LocalStorageKeys {
 export function useStoredCalendars(
   defaultValue: string[],
 ): [string[], (value: string[]) => void] {
-  const storageBucket = gcalendarHomepagePlugin.getId();
+  const storageBucket = gcalendarPlugin.getId();
   const storageKey = LocalStorageKeys.selectedCalendars;
   const storageApi = useApi(storageApiRef).forBucket(storageBucket);
   const setValue = (value: string[]) => {
diff --git a/plugins/gcalendar-homepage/src/icons/calendarIcon.svg b/plugins/gcalendar/src/icons/calendarIcon.svg
similarity index 100%
rename from plugins/gcalendar-homepage/src/icons/calendarIcon.svg
rename to plugins/gcalendar/src/icons/calendarIcon.svg
diff --git a/plugins/gcalendar-homepage/src/icons/zoomIcon.svg b/plugins/gcalendar/src/icons/zoomIcon.svg
similarity index 100%
rename from plugins/gcalendar-homepage/src/icons/zoomIcon.svg
rename to plugins/gcalendar/src/icons/zoomIcon.svg
diff --git a/plugins/gcalendar-homepage/src/index.ts b/plugins/gcalendar/src/index.ts
similarity index 90%
rename from plugins/gcalendar-homepage/src/index.ts
rename to plugins/gcalendar/src/index.ts
index faaeabf754..68886ec8e8 100644
--- a/plugins/gcalendar-homepage/src/index.ts
+++ b/plugins/gcalendar/src/index.ts
@@ -13,5 +13,5 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-export { gcalendarHomepagePlugin, CalendarCard } from './plugin';
+export { gcalendarPlugin, CalendarCard } from './plugin';
 export * from './api';
diff --git a/plugins/gcalendar-homepage/src/plugin.test.ts b/plugins/gcalendar/src/plugin.test.ts
similarity index 87%
rename from plugins/gcalendar-homepage/src/plugin.test.ts
rename to plugins/gcalendar/src/plugin.test.ts
index e5604f39dc..32a723eb20 100644
--- a/plugins/gcalendar-homepage/src/plugin.test.ts
+++ b/plugins/gcalendar/src/plugin.test.ts
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { gcalendarHomepagePlugin } from './plugin';
+import { gcalendarPlugin } from './plugin';
 
 describe('gcalendar-homepage', () => {
   it('should export plugin', () => {
-    expect(gcalendarHomepagePlugin).toBeDefined();
+    expect(gcalendarPlugin).toBeDefined();
   });
 });
diff --git a/plugins/gcalendar-homepage/src/plugin.ts b/plugins/gcalendar/src/plugin.ts
similarity index 92%
rename from plugins/gcalendar-homepage/src/plugin.ts
rename to plugins/gcalendar/src/plugin.ts
index 06a72a60fd..81482c51f4 100644
--- a/plugins/gcalendar-homepage/src/plugin.ts
+++ b/plugins/gcalendar/src/plugin.ts
@@ -24,7 +24,7 @@ import {
 import { GCalendarApiClient, gcalendarApiRef } from './api';
 import { rootRouteRef } from './routes';
 
-export const gcalendarHomepagePlugin = createPlugin({
+export const gcalendarPlugin = createPlugin({
   id: 'gcalendar-homepage',
   routes: {
     root: rootRouteRef,
@@ -40,7 +40,7 @@ export const gcalendarHomepagePlugin = createPlugin({
   ],
 });
 
-export const CalendarCard = gcalendarHomepagePlugin.provide(
+export const CalendarCard = gcalendarPlugin.provide(
   createComponentExtension({
     name: 'CalendarCard',
     component: {
diff --git a/plugins/gcalendar-homepage/src/routes.ts b/plugins/gcalendar/src/routes.ts
similarity index 100%
rename from plugins/gcalendar-homepage/src/routes.ts
rename to plugins/gcalendar/src/routes.ts
diff --git a/plugins/gcalendar-homepage/src/setupTests.ts b/plugins/gcalendar/src/setupTests.ts
similarity index 100%
rename from plugins/gcalendar-homepage/src/setupTests.ts
rename to plugins/gcalendar/src/setupTests.ts