diff --git a/backend/src/controllers/v2/secretController.ts b/backend/src/controllers/v2/secretController.ts
index 472859de9..e0cc936c4 100644
--- a/backend/src/controllers/v2/secretController.ts
+++ b/backend/src/controllers/v2/secretController.ts
@@ -2,7 +2,7 @@ import to from "await-to-js";
 import { Request, Response } from "express";
 import mongoose, { Types } from "mongoose";
 import Secret, { ISecret } from "../../models/secret";
-import { CreateSecretRequestBody, ModifySecretRequestBody, SanitizedSecretForCreate, SanitizedSecretModify } from "../../types/secret/types";
+import { CreateSecretRequestBody, ModifySecretRequestBody, SanitizedSecretForCreate, SanitizedSecretModify } from "../../types/secret";
 const { ValidationError } = mongoose.Error;
 import { BadRequestError, InternalServerError, UnauthorizedRequestError, ValidationError as RouteValidationError } from '../../utils/errors';
 import { AnyBulkWriteOperation } from 'mongodb';
diff --git a/backend/src/helpers/log.ts b/backend/src/helpers/log.ts
deleted file mode 100644
index 2a2f1530b..000000000
--- a/backend/src/helpers/log.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { Log, ILog } from '../models';
-import * as Sentry from '@sentry/node';
-import {
-    EVENT_PUSH_SECRETS,
-    EVENT_PULL_SECRETS
-} from '../variables';
-
-
-const handleLogHelper = async ({
-    log
-}: {
-    log: ILog
-}) => {
-    try {
-        switch (log.event) {
-            case EVENT_PULL_SECRETS:
-                // TODO
-                break;
-        }
-
-    } catch (err){
-        Sentry.setUser(null);
-        Sentry.captureException(err);
-    }
-}
\ No newline at end of file
diff --git a/backend/src/routes/v2/secret.ts b/backend/src/routes/v2/secret.ts
index 95ce3e6b0..52e0e316e 100644
--- a/backend/src/routes/v2/secret.ts
+++ b/backend/src/routes/v2/secret.ts
@@ -2,7 +2,7 @@ import express, { Request, Response } from 'express';
 import { requireAuth, requireWorkspaceAuth, validateRequest } from '../../middleware';
 import { body, param, query } from 'express-validator';
 import { ADMIN, MEMBER } from '../../variables';
-import { CreateSecretRequestBody, ModifySecretRequestBody } from '../../types/secret/types';
+import { CreateSecretRequestBody, ModifySecretRequestBody } from '../../types/secret';
 import { secretController } from '../../controllers/v2';
 import { fetchAllSecrets } from '../../controllers/v2/secretController';
 
diff --git a/backend/src/types/secret/types.ts b/backend/src/types/secret/index.d.ts
similarity index 100%
rename from backend/src/types/secret/types.ts
rename to backend/src/types/secret/index.d.ts
diff --git a/frontend/components/basic/dialog/AddServiceTokenDialog.js b/frontend/components/basic/dialog/AddServiceTokenDialog.js
index f0a6314e9..f9ef6d27c 100644
--- a/frontend/components/basic/dialog/AddServiceTokenDialog.js
+++ b/frontend/components/basic/dialog/AddServiceTokenDialog.js
@@ -72,6 +72,8 @@ const AddServiceTokenDialog = ({
       iv, 
       tag
     });
+    
+    console.log('newServiceToken', newServiceToken);
 
     setServiceTokens(serviceTokens.concat([newServiceToken.serviceTokenData]));
     setServiceToken(newServiceToken.serviceToken + "." + randomBytes);
diff --git a/frontend/pages/api/serviceToken/addServiceToken.ts b/frontend/pages/api/serviceToken/addServiceToken.ts
index fdc8ba27c..91019f413 100644
--- a/frontend/pages/api/serviceToken/addServiceToken.ts
+++ b/frontend/pages/api/serviceToken/addServiceToken.ts
@@ -31,7 +31,7 @@ const addServiceToken = ({
   iv, 
   tag
 }: Props) => {
-  return SecurityClient.fetchCall('/api/v2/service-token-data/', {
+  return SecurityClient.fetchCall('/api/v2/service-token/', {
     method: 'POST',
     headers: {
       'Content-Type': 'application/json'
diff --git a/frontend/pages/api/serviceToken/deleteServiceToken.ts b/frontend/pages/api/serviceToken/deleteServiceToken.ts
index b59ad0b8a..94f2f1602 100644
--- a/frontend/pages/api/serviceToken/deleteServiceToken.ts
+++ b/frontend/pages/api/serviceToken/deleteServiceToken.ts
@@ -13,7 +13,7 @@ interface Props {
 const deleteServiceToken = ({
   serviceTokenId,
 }: Props) => {
-  return SecurityClient.fetchCall('/api/v2/service-token-data/' + serviceTokenId, {
+  return SecurityClient.fetchCall('/api/v2/service-token/' + serviceTokenId, {
     method: 'DELETE',
     headers: {
       'Content-Type': 'application/json'