diff --git a/packages/backend/src/apps/slack2/actions/find-message/find-message.ts b/packages/backend/src/apps/slack/actions/find-message/find-message.ts
similarity index 100%
rename from packages/backend/src/apps/slack2/actions/find-message/find-message.ts
rename to packages/backend/src/apps/slack/actions/find-message/find-message.ts
diff --git a/packages/backend/src/apps/slack2/actions/find-message/index.ts b/packages/backend/src/apps/slack/actions/find-message/index.ts
similarity index 100%
rename from packages/backend/src/apps/slack2/actions/find-message/index.ts
rename to packages/backend/src/apps/slack/actions/find-message/index.ts
diff --git a/packages/backend/src/apps/slack2/actions/send-a-message-to-channel/index.ts b/packages/backend/src/apps/slack/actions/send-a-message-to-channel/index.ts
similarity index 100%
rename from packages/backend/src/apps/slack2/actions/send-a-message-to-channel/index.ts
rename to packages/backend/src/apps/slack/actions/send-a-message-to-channel/index.ts
diff --git a/packages/backend/src/apps/slack2/actions/send-a-message-to-channel/post-message.ts b/packages/backend/src/apps/slack/actions/send-a-message-to-channel/post-message.ts
similarity index 100%
rename from packages/backend/src/apps/slack2/actions/send-a-message-to-channel/post-message.ts
rename to packages/backend/src/apps/slack/actions/send-a-message-to-channel/post-message.ts
diff --git a/packages/backend/src/apps/slack2/auth/index.ts b/packages/backend/src/apps/slack/auth/index.ts
similarity index 100%
rename from packages/backend/src/apps/slack2/auth/index.ts
rename to packages/backend/src/apps/slack/auth/index.ts
diff --git a/packages/backend/src/apps/slack2/auth/is-still-verified.ts b/packages/backend/src/apps/slack/auth/is-still-verified.ts
similarity index 100%
rename from packages/backend/src/apps/slack2/auth/is-still-verified.ts
rename to packages/backend/src/apps/slack/auth/is-still-verified.ts
diff --git a/packages/backend/src/apps/slack2/auth/verify-credentials.ts b/packages/backend/src/apps/slack/auth/verify-credentials.ts
similarity index 100%
rename from packages/backend/src/apps/slack2/auth/verify-credentials.ts
rename to packages/backend/src/apps/slack/auth/verify-credentials.ts
diff --git a/packages/backend/src/apps/slack2/index.ts b/packages/backend/src/apps/slack/index.ts
similarity index 100%
rename from packages/backend/src/apps/slack2/index.ts
rename to packages/backend/src/apps/slack/index.ts
diff --git a/packages/backend/src/apps/twitter2/auth/create-auth-data.ts b/packages/backend/src/apps/twitter/auth/create-auth-data.ts
similarity index 100%
rename from packages/backend/src/apps/twitter2/auth/create-auth-data.ts
rename to packages/backend/src/apps/twitter/auth/create-auth-data.ts
diff --git a/packages/backend/src/apps/twitter2/auth/index.ts b/packages/backend/src/apps/twitter/auth/index.ts
similarity index 100%
rename from packages/backend/src/apps/twitter2/auth/index.ts
rename to packages/backend/src/apps/twitter/auth/index.ts
diff --git a/packages/backend/src/apps/twitter2/auth/is-still-verified.ts b/packages/backend/src/apps/twitter/auth/is-still-verified.ts
similarity index 100%
rename from packages/backend/src/apps/twitter2/auth/is-still-verified.ts
rename to packages/backend/src/apps/twitter/auth/is-still-verified.ts
diff --git a/packages/backend/src/apps/twitter2/auth/verify-credentials.ts b/packages/backend/src/apps/twitter/auth/verify-credentials.ts
similarity index 100%
rename from packages/backend/src/apps/twitter2/auth/verify-credentials.ts
rename to packages/backend/src/apps/twitter/auth/verify-credentials.ts
diff --git a/packages/backend/src/apps/twitter2/common/generate-request.ts b/packages/backend/src/apps/twitter/common/generate-request.ts
similarity index 100%
rename from packages/backend/src/apps/twitter2/common/generate-request.ts
rename to packages/backend/src/apps/twitter/common/generate-request.ts
diff --git a/packages/backend/src/apps/twitter2/common/get-current-user.ts b/packages/backend/src/apps/twitter/common/get-current-user.ts
similarity index 100%
rename from packages/backend/src/apps/twitter2/common/get-current-user.ts
rename to packages/backend/src/apps/twitter/common/get-current-user.ts
diff --git a/packages/backend/src/apps/twitter2/common/get-user-by-username.ts b/packages/backend/src/apps/twitter/common/get-user-by-username.ts
similarity index 100%
rename from packages/backend/src/apps/twitter2/common/get-user-by-username.ts
rename to packages/backend/src/apps/twitter/common/get-user-by-username.ts
diff --git a/packages/backend/src/apps/twitter2/common/get-user-followers.ts b/packages/backend/src/apps/twitter/common/get-user-followers.ts
similarity index 100%
rename from packages/backend/src/apps/twitter2/common/get-user-followers.ts
rename to packages/backend/src/apps/twitter/common/get-user-followers.ts
diff --git a/packages/backend/src/apps/twitter2/common/get-user-tweets.ts b/packages/backend/src/apps/twitter/common/get-user-tweets.ts
similarity index 100%
rename from packages/backend/src/apps/twitter2/common/get-user-tweets.ts
rename to packages/backend/src/apps/twitter/common/get-user-tweets.ts
diff --git a/packages/backend/src/apps/twitter2/common/oauth-client.ts b/packages/backend/src/apps/twitter/common/oauth-client.ts
similarity index 100%
rename from packages/backend/src/apps/twitter2/common/oauth-client.ts
rename to packages/backend/src/apps/twitter/common/oauth-client.ts
diff --git a/packages/backend/src/apps/twitter2/index.ts b/packages/backend/src/apps/twitter/index.ts
similarity index 100%
rename from packages/backend/src/apps/twitter2/index.ts
rename to packages/backend/src/apps/twitter/index.ts
diff --git a/packages/backend/src/apps/twitter2/triggers/my-tweets/index.ts b/packages/backend/src/apps/twitter/triggers/my-tweets/index.ts
similarity index 100%
rename from packages/backend/src/apps/twitter2/triggers/my-tweets/index.ts
rename to packages/backend/src/apps/twitter/triggers/my-tweets/index.ts
diff --git a/packages/backend/src/apps/twitter2/triggers/new-follower-of-me/index.ts b/packages/backend/src/apps/twitter/triggers/new-follower-of-me/index.ts
similarity index 100%
rename from packages/backend/src/apps/twitter2/triggers/new-follower-of-me/index.ts
rename to packages/backend/src/apps/twitter/triggers/new-follower-of-me/index.ts
diff --git a/packages/backend/src/apps/twitter2/triggers/new-follower-of-me/my-followers.ts b/packages/backend/src/apps/twitter/triggers/new-follower-of-me/my-followers.ts
similarity index 100%
rename from packages/backend/src/apps/twitter2/triggers/new-follower-of-me/my-followers.ts
rename to packages/backend/src/apps/twitter/triggers/new-follower-of-me/my-followers.ts
diff --git a/packages/backend/src/apps/twitter2/triggers/search-tweets/index.ts b/packages/backend/src/apps/twitter/triggers/search-tweets/index.ts
similarity index 100%
rename from packages/backend/src/apps/twitter2/triggers/search-tweets/index.ts
rename to packages/backend/src/apps/twitter/triggers/search-tweets/index.ts
diff --git a/packages/backend/src/apps/twitter2/triggers/search-tweets/search-tweets.ts b/packages/backend/src/apps/twitter/triggers/search-tweets/search-tweets.ts
similarity index 100%
rename from packages/backend/src/apps/twitter2/triggers/search-tweets/search-tweets.ts
rename to packages/backend/src/apps/twitter/triggers/search-tweets/search-tweets.ts
diff --git a/packages/backend/src/apps/twitter2/triggers/user-tweets/index.ts b/packages/backend/src/apps/twitter/triggers/user-tweets/index.ts
similarity index 100%
rename from packages/backend/src/apps/twitter2/triggers/user-tweets/index.ts
rename to packages/backend/src/apps/twitter/triggers/user-tweets/index.ts
diff --git a/packages/backend/src/models/app.ts b/packages/backend/src/models/app.ts
index 25ba834c..948cdfac 100644
--- a/packages/backend/src/models/app.ts
+++ b/packages/backend/src/models/app.ts
@@ -10,8 +10,7 @@ class App {
 
   // Temporaryly restrict the apps we expose until
   // their actions/triggers are implemented!
-  static temporaryList = ['slack2', 'twitter2'];
-  // static temporaryList = ['slack', 'twitter', 'scheduler'];
+  static temporaryList = ['slack', 'twitter'];
 
   static async findAll(name?: string): Promise<IApp[]> {
     if (!name)
diff --git a/packages/types/index.d.ts b/packages/types/index.d.ts
index 38b04952..07344b6c 100644
--- a/packages/types/index.d.ts
+++ b/packages/types/index.d.ts
@@ -204,6 +204,7 @@ export interface IAuthentication {
 }
 
 export interface ISubstep {
+  key: string;
   name: string;
   arguments: IField[];
 }
diff --git a/packages/web/src/components/AddAppConnection/index.tsx b/packages/web/src/components/AddAppConnection/index.tsx
index ddbf5359..3759514b 100644
--- a/packages/web/src/components/AddAppConnection/index.tsx
+++ b/packages/web/src/components/AddAppConnection/index.tsx
@@ -30,7 +30,8 @@ type Response = {
 
 export default function AddAppConnection(props: AddAppConnectionProps): React.ReactElement {
   const { application, connectionId, onClose } = props;
-  const { name, authDocUrl, key, fields, authenticationSteps, reconnectionSteps } = application;
+  const { name, authDocUrl, key, auth } = application;
+  const { fields, authenticationSteps, reconnectionSteps } = auth;
   const formatMessage = useFormatMessage();
   const [errorMessage, setErrorMessage] = React.useState<string | null>(null);
   const [inProgress, setInProgress] = React.useState(false);
diff --git a/packages/web/src/components/ChooseAppAndEventSubstep/index.tsx b/packages/web/src/components/ChooseAppAndEventSubstep/index.tsx
index 15f557ec..b6bcb461 100644
--- a/packages/web/src/components/ChooseAppAndEventSubstep/index.tsx
+++ b/packages/web/src/components/ChooseAppAndEventSubstep/index.tsx
@@ -12,7 +12,7 @@ import useFormatMessage from 'hooks/useFormatMessage';
 import { EditorContext } from 'contexts/Editor';
 import { GET_APPS } from 'graphql/queries/get-apps';
 import FlowSubstepTitle from 'components/FlowSubstepTitle';
-import type { IApp, IStep, ISubstep } from '@automatisch/types';
+import type { IApp, IStep, ISubstep, ITrigger, IAction } from '@automatisch/types';
 
 type ChooseAppAndEventSubstepProps = {
   substep: ISubstep;
@@ -24,7 +24,7 @@ type ChooseAppAndEventSubstepProps = {
   step: IStep;
 };
 
-const optionGenerator = (app: IApp): { label: string; value: string } => ({
+const optionGenerator = (app: { name: string, key: string, }): { label: string; value: string } => ({
   label: app.name as string,
   value: app.key as string,
 });
@@ -68,7 +68,7 @@ function ChooseAppAndEventSubstep(
   const selectedActionOrTrigger =
     actionsOrTriggers?.find(
       (actionOrTrigger) => actionOrTrigger.key === step?.key
-    ) || null;
+    );
 
   const { name } = substep;
 
@@ -179,11 +179,11 @@ function ChooseAppAndEventSubstep(
             </Box>
           )}
 
-          {isTrigger && selectedActionOrTrigger?.pollInterval && (
+          {isTrigger && (selectedActionOrTrigger as ITrigger)?.pollInterval && (
             <TextField
               label={formatMessage('flowEditor.pollIntervalLabel')}
               value={formatMessage('flowEditor.pollIntervalValue', {
-                minutes: selectedActionOrTrigger.pollInterval,
+                minutes: (selectedActionOrTrigger as ITrigger)?.pollInterval,
               })}
               sx={{ mt: 2 }}
               fullWidth
diff --git a/packages/web/src/components/FlowStep/index.tsx b/packages/web/src/components/FlowStep/index.tsx
index 16ad7713..1e695973 100644
--- a/packages/web/src/components/FlowStep/index.tsx
+++ b/packages/web/src/components/FlowStep/index.tsx
@@ -235,7 +235,7 @@ export default function FlowStep(
               >
                 <ChooseAppAndEventSubstep
                   expanded={currentSubstep === 0}
-                  substep={{ name: 'Choose app & event', arguments: [] }}
+                  substep={{ key: 'chooAppAndEvent', name: 'Choose app & event', arguments: [] }}
                   onExpand={() => toggleSubstep(0)}
                   onCollapse={() => toggleSubstep(0)}
                   onSubmit={expandNextStep}
@@ -246,11 +246,7 @@ export default function FlowStep(
                 {substeps?.length > 0 &&
                   substeps.map(
                     (
-                      substep: {
-                        name: string;
-                        key: string;
-                        arguments: IField[];
-                      },
+                      substep: ISubstep,
                       index: number
                     ) => (
                       <React.Fragment key={`${substep?.name}-${index}`}>
@@ -279,7 +275,7 @@ export default function FlowStep(
                           />
                         )}
 
-                        {['chooseConnection', 'testStep'].includes(substep.key) ===
+                        {substep.key && ['chooseConnection', 'testStep'].includes(substep.key) ===
                           false && (
                           <FlowSubstep
                             expanded={currentSubstep === index + 1}