diff --git a/web/src/components/questions/GenericQuestion.test.tsx b/web/src/components/questions/GenericQuestion.test.tsx
index c5f3536688..a45855a49b 100644
--- a/web/src/components/questions/GenericQuestion.test.tsx
+++ b/web/src/components/questions/GenericQuestion.test.tsx
@@ -22,8 +22,8 @@
 import React from "react";
 import { screen } from "@testing-library/react";
 import { plainRender } from "~/test-utils";
-import { GenericQuestion } from "~/components/questions";
 import { Question } from "~/types/questions";
+import GenericQuestion from "~/components/questions/GenericQuestion";
 
 const question: Question = {
   id: 1,
diff --git a/web/src/components/questions/GenericQuestion.tsx b/web/src/components/questions/GenericQuestion.tsx
index 6a3a8f974f..d1f2f34de9 100644
--- a/web/src/components/questions/GenericQuestion.tsx
+++ b/web/src/components/questions/GenericQuestion.tsx
@@ -22,8 +22,8 @@
 import React from "react";
 import { Text } from "@patternfly/react-core";
 import { Popup } from "~/components/core";
-import { QuestionActions } from "~/components/questions";
 import { AnswerCallback, Question } from "~/types/questions";
+import QuestionActions from "~/components/questions/QuestionActions";
 import { _ } from "~/i18n";
 
 /**
diff --git a/web/src/components/questions/LuksActivationQuestion.test.tsx b/web/src/components/questions/LuksActivationQuestion.test.tsx
index 41a5326d05..c2da7b99cd 100644
--- a/web/src/components/questions/LuksActivationQuestion.test.tsx
+++ b/web/src/components/questions/LuksActivationQuestion.test.tsx
@@ -22,8 +22,8 @@
 import React from "react";
 import { screen } from "@testing-library/react";
 import { plainRender } from "~/test-utils";
-import { LuksActivationQuestion } from "~/components/questions";
 import { AnswerCallback, Question } from "~/types/questions";
+import LuksActivationQuestion from "~/components/questions/LuksActivationQuestion";
 
 let question: Question;
 const questionMock: Question = {
diff --git a/web/src/components/questions/LuksActivationQuestion.tsx b/web/src/components/questions/LuksActivationQuestion.tsx
index 233a1367f7..8862defbc6 100644
--- a/web/src/components/questions/LuksActivationQuestion.tsx
+++ b/web/src/components/questions/LuksActivationQuestion.tsx
@@ -23,7 +23,7 @@ import React, { useState } from "react";
 import { Alert as PFAlert, Form, FormGroup, Text } from "@patternfly/react-core";
 import { Icon } from "~/components/layout";
 import { PasswordInput, Popup } from "~/components/core";
-import { QuestionActions } from "~/components/questions";
+import QuestionActions from "~/components/questions/QuestionActions";
 import { _ } from "~/i18n";
 
 /**
diff --git a/web/src/components/questions/QuestionActions.test.tsx b/web/src/components/questions/QuestionActions.test.tsx
index 92276120f5..ad6fc6280c 100644
--- a/web/src/components/questions/QuestionActions.test.tsx
+++ b/web/src/components/questions/QuestionActions.test.tsx
@@ -22,8 +22,8 @@
 import React from "react";
 import { screen } from "@testing-library/react";
 import { installerRender } from "~/test-utils";
-import { QuestionActions } from "~/components/questions";
 import { Question } from "~/types/questions";
+import QuestionActions from "~/components/questions/QuestionActions";
 
 let defaultOption = "sure";
 
diff --git a/web/src/components/questions/QuestionWithPassword.test.tsx b/web/src/components/questions/QuestionWithPassword.test.tsx
index bf5b3d0c3d..371daaf20a 100644
--- a/web/src/components/questions/QuestionWithPassword.test.tsx
+++ b/web/src/components/questions/QuestionWithPassword.test.tsx
@@ -22,8 +22,8 @@
 import React from "react";
 import { screen } from "@testing-library/react";
 import { plainRender } from "~/test-utils";
-import { QuestionWithPassword } from "~/components/questions";
 import { Question } from "~/types/questions";
+import QuestionWithPassword from "~/components/questions/QuestionWithPassword";
 
 const answerFn = jest.fn();
 const question: Question = {
diff --git a/web/src/components/questions/QuestionWithPassword.tsx b/web/src/components/questions/QuestionWithPassword.tsx
index 651c875c85..f18f250625 100644
--- a/web/src/components/questions/QuestionWithPassword.tsx
+++ b/web/src/components/questions/QuestionWithPassword.tsx
@@ -23,8 +23,8 @@ import React, { useState } from "react";
 import { Form, FormGroup, Text } from "@patternfly/react-core";
 import { Icon } from "~/components/layout";
 import { PasswordInput, Popup } from "~/components/core";
-import { QuestionActions } from "~/components/questions";
 import { AnswerCallback, Question } from "~/types/questions";
+import QuestionActions from "~/components/questions/QuestionActions";
 import { _ } from "~/i18n";
 
 /**
diff --git a/web/src/components/questions/Questions.test.tsx b/web/src/components/questions/Questions.test.tsx
index a68662dcc3..f85555e760 100644
--- a/web/src/components/questions/Questions.test.tsx
+++ b/web/src/components/questions/Questions.test.tsx
@@ -22,8 +22,8 @@
 import React from "react";
 import { screen } from "@testing-library/react";
 import { installerRender, plainRender } from "~/test-utils";
-import { Questions } from "~/components/questions";
 import { Question, QuestionType } from "~/types/questions";
+import Questions from "~/components/questions/Questions";
 import * as GenericQuestionComponent from "~/components/questions/GenericQuestion";
 
 let mockQuestions: Question[];
diff --git a/web/src/components/questions/Questions.tsx b/web/src/components/questions/Questions.tsx
index e08d31d60c..42ef731d26 100644
--- a/web/src/components/questions/Questions.tsx
+++ b/web/src/components/questions/Questions.tsx
@@ -20,11 +20,9 @@
  */
 
 import React from "react";
-import {
-  GenericQuestion,
-  QuestionWithPassword,
-  LuksActivationQuestion,
-} from "~/components/questions";
+import GenericQuestion from "~/components/questions/GenericQuestion";
+import QuestionWithPassword from "~/components/questions/QuestionWithPassword";
+import LuksActivationQuestion from "~/components/questions/LuksActivationQuestion";
 import { useQuestions, useQuestionsConfig, useQuestionsChanges } from "~/queries/questions";
 import { AnswerCallback, QuestionType } from "~/types/questions";
 
diff --git a/web/src/components/questions/index.ts b/web/src/components/questions/index.ts
index 0633e0610c..95dcc90e28 100644
--- a/web/src/components/questions/index.ts
+++ b/web/src/components/questions/index.ts
@@ -19,8 +19,4 @@
  * find current contact information at www.suse.com.
  */
 
-export { default as QuestionActions } from "./QuestionActions";
-export { default as GenericQuestion } from "./GenericQuestion";
-export { default as QuestionWithPassword } from "./QuestionWithPassword";
-export { default as LuksActivationQuestion } from "./LuksActivationQuestion";
 export { default as Questions } from "./Questions";