diff --git a/src/components/addpeer/LinuxTab.tsx b/src/components/addpeer/LinuxTab.tsx
index 01cad652..6de57adf 100644
--- a/src/components/addpeer/LinuxTab.tsx
+++ b/src/components/addpeer/LinuxTab.tsx
@@ -10,7 +10,7 @@ export const OtherTab = () => {
     const [steps, _] = useState([
         {
             key: 1,
-            title: 'For different installation options check out our documentation.',
+            title: 'For other installation options check our documentation.',
             commands: (
                 <Button type="primary" href={`https://netbird.io/docs/getting-started/installation#binary-install`} target="_blank">
                     Documentation
diff --git a/src/store/group/actions.ts b/src/store/group/actions.ts
index 0c4b1a45..149d826e 100644
--- a/src/store/group/actions.ts
+++ b/src/store/group/actions.ts
@@ -1,6 +1,11 @@
 import { ActionType, createAction, createAsyncAction } from 'typesafe-actions';
 import { Group } from './types';
-import {ApiError, CreateResponse, DeleteResponse, RequestPayload} from '../../services/api-client/types';
+import {
+  ApiError,
+  CreateResponse,
+  DeleteResponse,
+  RequestPayload
+} from '../../services/api-client/types';
 
 const actions = {
   getGroups: createAsyncAction(
diff --git a/src/store/peer/actions.ts b/src/store/peer/actions.ts
index 687cbc4d..4500da2e 100644
--- a/src/store/peer/actions.ts
+++ b/src/store/peer/actions.ts
@@ -1,6 +1,12 @@
 import { ActionType, createAction, createAsyncAction } from 'typesafe-actions';
 import {Peer, PeerGroupsToSave} from './types';
-import {ApiError, ChangeResponse, DeleteResponse, RequestPayload} from '../../services/api-client/types';
+import {
+  ApiError,
+  ChangeResponse,
+  CreateResponse,
+  DeleteResponse,
+  RequestPayload
+} from '../../services/api-client/types';
 import {Group} from "../group/types";
 
 const actions = {
@@ -28,7 +34,14 @@ const actions = {
 
   removePeer:  createAction('REMOVE_PEER')<string>(),
   setPeer: createAction('SET_PEER')<Peer | null>(),
-  setUpdateGroupsVisible: createAction('SET_UPDATE_GROUPS_VISIBLE')<boolean>()
+  setUpdateGroupsVisible: createAction('SET_UPDATE_GROUPS_VISIBLE')<boolean>(),
+  updatePeer: createAsyncAction(
+      'UPDATE_PEER',
+      'UPDATE_PEER_SUCCESS',
+      'UPDATE_PEER_FAILURE',
+  )<RequestPayload<Peer>, ChangeResponse<Peer | null>, ChangeResponse<Peer | null>>(),
+  setUpdatedPeer: createAction('SET_UPDATED_PEER')<ChangeResponse<Peer | null>>(),
+  resetUpdatedPeer: createAction('RESET_UPDATED_PEER')<null>(),
 };
 
 export type ActionTypes = ActionType<typeof actions>;
diff --git a/src/store/peer/reducer.ts b/src/store/peer/reducer.ts
index 7bbaa5d7..5027fe0a 100644
--- a/src/store/peer/reducer.ts
+++ b/src/store/peer/reducer.ts
@@ -2,7 +2,7 @@ import { createReducer } from 'typesafe-actions';
 import { combineReducers } from 'redux';
 import { Peer } from './types';
 import actions, { ActionTypes } from './actions';
-import {ApiError, ChangeResponse, DeleteResponse} from "../../services/api-client/types";
+import {ApiError, ChangeResponse, CreateResponse, DeleteResponse} from "../../services/api-client/types";
 import {Group} from "../group/types";
 
 type StateType = Readonly<{
@@ -14,6 +14,7 @@ type StateType = Readonly<{
   deletedPeer: DeleteResponse<string | null>;
   setUpdateGroupsVisible: boolean;
   savedGroups: ChangeResponse<Group[] | null>;
+  updatedPeer: CreateResponse<Peer | null>;
 }>;
 
 const initialState: StateType = {
@@ -36,7 +37,14 @@ const initialState: StateType = {
     failure: false,
     error: null,
     data: null
-  }
+  },
+  updatedPeer: <ChangeResponse<Peer | null>>{
+    loading: false,
+    success: false,
+    failure: false,
+    error: null,
+    data : null
+  },
 };
 
 const data = createReducer<Peer[], ActionTypes>(initialState.data as Peer[])
@@ -77,6 +85,13 @@ const savedGroups = createReducer<ChangeResponse<Group[] | null>, ActionTypes>(i
     .handleAction(actions.saveGroups.failure, (store, action) => action.payload)
     .handleAction(actions.resetSavedGroups, () => initialState.savedGroups)
 
+const updatedPeer = createReducer<CreateResponse<Peer | null>, ActionTypes>(initialState.updatedPeer)
+    .handleAction(actions.updatePeer.request, () => initialState.updatedPeer)
+    .handleAction(actions.updatePeer.success, (store, action) => action.payload)
+    .handleAction(actions.updatePeer.failure, (store, action) => action.payload)
+    .handleAction(actions.setUpdatedPeer, (store, action) => action.payload)
+    .handleAction(actions.resetUpdatedPeer, () => initialState.updatedPeer)
+
 export default combineReducers({
   data,
   peer,
@@ -85,5 +100,6 @@ export default combineReducers({
   saving,
   deletedPeer,
   updateGroupsVisible,
-  savedGroups
+  savedGroups,
+  updatedPeer
 });
diff --git a/src/store/peer/sagas.ts b/src/store/peer/sagas.ts
index 9c87d079..2d4d4441 100644
--- a/src/store/peer/sagas.ts
+++ b/src/store/peer/sagas.ts
@@ -4,8 +4,7 @@ import {
   ApiResponse,
   ChangeResponse,
   CreateResponse,
-  DeleteResponse,
-  RequestPayload
+  DeleteResponse
 } from '../../services/api-client/types';
 import { Peer } from './types'
 import service from './service';
@@ -153,11 +152,56 @@ export function* saveGroups(action: ReturnType<typeof actions.saveGroups.request
   }
 }
 
+export function* updatePeer(action: ReturnType<typeof actions.updatePeer.request>): Generator {
+  try {
+    yield put(actions.setUpdatedPeer({
+      loading: true,
+      success: false,
+      failure: false,
+      error: null,
+      data: null
+    }))
+
+    const peer = action.payload.payload
+    const peerId = peer.id
+
+    const payloadToSave = {
+      getAccessTokenSilently: action.payload.getAccessTokenSilently,
+      payload: peer
+    }
+
+    const effect = yield call(service.updatePeer, payloadToSave)
+    const response = effect as ApiResponse<Peer>;
+
+    yield put(actions.updatePeer.success({
+      loading: false,
+      success: true,
+      failure: false,
+      error: null,
+      data: response.body
+    } as ChangeResponse<Peer | null>));
+
+    const peers = (yield select(state => state.peer.data)) as Peer[]
+    yield put(actions.getPeers.success(peers.filter((p:Peer) => p.id !== peerId).concat(response.body)))
+
+  } catch (err) {
+    console.log(err)
+    yield put(actions.updatePeer.failure({
+      loading: false,
+      success: false,
+      failure: true,
+      error: err as ApiError,
+      data: null
+    } as ChangeResponse<Peer | null>));
+  }
+}
+
 export default function* sagas(): Generator {
   yield all([
     takeLatest(actions.getPeers.request, getPeers),
     takeLatest(actions.deletedPeer.request, deletePeer),
-    takeLatest(actions.saveGroups.request, saveGroups)
+    takeLatest(actions.saveGroups.request, saveGroups),
+    takeLatest(actions.updatePeer.request, updatePeer)
   ]);
 }
 
diff --git a/src/store/peer/service.ts b/src/store/peer/service.ts
index 8aab91be..0eaa0f50 100644
--- a/src/store/peer/service.ts
+++ b/src/store/peer/service.ts
@@ -14,5 +14,13 @@ export default {
         `/api/peers/` + payload.payload,
         payload
     );
+  },
+  async updatePeer(payload:RequestPayload<Peer>): Promise<ApiResponse<Peer>> {
+    const id = payload.payload.id
+    delete payload.payload.id
+    return apiClient.put<Peer>(
+        `/api/peers/${id}`,
+        payload
+    );
   }
 };
diff --git a/src/store/peer/types.ts b/src/store/peer/types.ts
index b6fcf8c0..3317d5ad 100644
--- a/src/store/peer/types.ts
+++ b/src/store/peer/types.ts
@@ -9,6 +9,7 @@ export interface Peer {
   os: string,
   version: string,
   groups?: Group[]
+  ssh_enabled: boolean,
 }
 
 export interface PeerToSave extends Peer {
diff --git a/src/store/rule/reducer.ts b/src/store/rule/reducer.ts
index dfbaceed..b1aef439 100644
--- a/src/store/rule/reducer.ts
+++ b/src/store/rule/reducer.ts
@@ -2,7 +2,7 @@ import { createReducer } from 'typesafe-actions';
 import { combineReducers } from 'redux';
 import { Rule } from './types';
 import actions, { ActionTypes } from './actions';
-import {ApiError, DeleteResponse, CreateResponse, ChangeResponse} from "../../services/api-client/types";
+import {ApiError, DeleteResponse, CreateResponse} from "../../services/api-client/types";
 
 type StateType = Readonly<{
   data: Rule[] | null;
diff --git a/src/views/AccessControl.tsx b/src/views/AccessControl.tsx
index 84d2ed42..6b318d33 100644
--- a/src/views/AccessControl.tsx
+++ b/src/views/AccessControl.tsx
@@ -19,12 +19,9 @@ import {CloseOutlined, ExclamationCircleOutlined} from "@ant-design/icons";
 import bidirect from '../assets/direct_bi.svg';
 import inbound from '../assets/direct_in.svg';
 import outbound from '../assets/direct_out.svg';
-import tutorial from "../assets/access_control_tutorial.svg";
 import AccessControlNew from "../components/AccessControlNew";
 import {Group} from "../store/group/types";
-import {actions as setupKeyActions} from "../store/setup-key";
 import AccessControlModalGroups from "../components/AccessControlModalGroups";
-import TableSpin from "../components/Spin";
 import tableSpin from "../components/Spin";
 
 const { Title, Paragraph } = Typography;
diff --git a/src/views/Peers.tsx b/src/views/Peers.tsx
index 7aa8836c..451cb1b1 100644
--- a/src/views/Peers.tsx
+++ b/src/views/Peers.tsx
@@ -2,30 +2,37 @@ import React, {useEffect, useState} from 'react';
 import {Link} from 'react-router-dom';
 import {useDispatch, useSelector} from "react-redux";
 import {useAuth0, withAuthenticationRequired} from "@auth0/auth0-react";
-import { RootState } from "typesafe-actions";
-import { actions as peerActions } from '../store/peer';
-import { actions as groupActions } from '../store/group';
+import {RootState} from "typesafe-actions";
+import {actions as peerActions} from '../store/peer';
+import {actions as groupActions} from '../store/group';
 import Loading from "../components/Loading";
 import {Container} from "../components/Container";
 import {
-    Col,
-    Row,
-    Typography,
-    Table,
+    Alert,
+    Button,
     Card,
-    Tag,
+    Col,
+    Dropdown,
     Input,
-    Space,
+    Menu,
+    message,
+    Modal,
+    Popover,
     Radio,
     RadioChangeEvent,
-    Dropdown,
-    Menu,
-    Alert, Select, Modal, Button, message, Popover, SpinProps, Spin
+    Row,
+    Select,
+    Space,
+    Switch,
+    Table,
+    Tag,
+    Typography,
+    Tooltip
 } from "antd";
 import {Peer} from "../store/peer/types";
 import {filter} from "lodash"
 import {formatOS, timeAgo} from "../utils/common";
-import {ExclamationCircleOutlined} from "@ant-design/icons";
+import Icon, {ExclamationCircleOutlined, QuestionCircleOutlined, WarningOutlined} from "@ant-design/icons";
 import ButtonCopyMessage from "../components/ButtonCopyMessage";
 import {Group, GroupPeer} from "../store/group/types";
 import PeerGroupsUpdate from "../components/PeerGroupsUpdate";
@@ -53,6 +60,7 @@ export const Peers = () => {
     const groups = useSelector((state: RootState) => state.group.data);
     const loadingGroups = useSelector((state: RootState) => state.group.loading);
     const savedGroups = useSelector((state: RootState) => state.peer.savedGroups);
+    const updatedPeer = useSelector((state: RootState) => state.peer.updatedPeer);
 
     const [textToSearch, setTextToSearch] = useState('');
     const [optionOnOff, setOptionOnOff] = useState('all');
@@ -133,6 +141,22 @@ export const Peers = () => {
         }
     }, [savedGroups])
 
+    const updatePeerKey = 'updating_peer';
+    useEffect(() => {
+        const style = { marginTop: 85 }
+        if (updatedPeer.loading) {
+            message.loading({ content: 'Updating peer...', key: updatePeerKey, duration: 0, style })
+        } else if (updatedPeer.success) {
+            message.success({ content: 'Peer has been successfully updated.', key: updatePeerKey, duration: 2, style });
+            dispatch(peerActions.setUpdatedPeer({ ...updatedPeer, success: false }))
+            dispatch(peerActions.resetUpdatedPeer(null))
+        } else if (updatedPeer.error) {
+            message.error({ content: 'Failed to update peer. You might not have enough permissions.', key: updatePeerKey, duration: 2, style  });
+            dispatch(peerActions.setUpdatedPeer({ ...updatedPeer, error: null }))
+            dispatch(peerActions.resetUpdatedPeer(null))
+        }
+    }, [updatedPeer])
+
     const filterDataTable = ():Peer[] => {
         const t = textToSearch.toLowerCase().trim()
          let f:Peer[] = filter(peers, (f:Peer) =>
@@ -162,17 +186,12 @@ export const Peers = () => {
     }
 
     const showConfirmDelete = () => {
+        let name = peerToAction ? peerToAction.name : ''
         confirm({
             icon: <ExclamationCircleOutlined />,
+            title: "Delete peer \"" + name + "\"",
             width: 600,
-            content: <Space direction="vertical" size="small">
-                {peerToAction &&
-                    <>
-                        <Title level={5}>Delete peer "{peerToAction ? peerToAction.name : ''}"</Title>
-                        <Paragraph>Are you sure you want to delete peer from your account?</Paragraph>
-                    </>
-                }
-            </Space>,
+            content: "Are you sure you want to delete peer from your account?",
             okType: 'danger',
             onOk() {
                 dispatch(peerActions.deletedPeer.request({getAccessTokenSilently, payload: peerToAction ? peerToAction.ip : ''}));
@@ -183,6 +202,29 @@ export const Peers = () => {
         });
     }
 
+    const showConfirmEnableSSH = (record: PeerDataTable) => {
+        confirm({
+            icon: <ExclamationCircleOutlined />,
+            title: "Enable SSH Server for \"" + record.name + "\"?",
+            width: 600,
+            content: "Experimental feature. Enabling this option allows remote SSH access to this machine from other connected network participants.",
+            okType: 'danger',
+            onOk() {
+                handleSwitchSSH(record, true)
+            },
+            onCancel() {
+            },
+        });
+    }
+    function handleSwitchSSH(record: PeerDataTable, checked: boolean) {
+        const peer = {
+            id: record.id,
+            ssh_enabled: checked,
+            name: record.name
+        } as Peer
+        dispatch(peerActions.updatePeer.request({getAccessTokenSilently, payload: peer}));
+
+    }
     const setUpdateGroupsVisible = (peerToAction:Peer, status:boolean) => {
         if (status) {
             dispatch(peerActions.setPeer({...peerToAction}))
@@ -288,16 +330,42 @@ export const Peers = () => {
                                                 return <ButtonCopyMessage keyMessage={(record as PeerDataTable).key} text={text} messageText={'IP copied!'} styleNotification={{}}/>
                                             }}
                                     />
-                                    <Column title="Status" dataIndex="connected"
+                                    <Column title="Status" dataIndex="connected" align="center"
                                             render={(text, record, index) => {
                                                 return text ? <Tag color="green">online</Tag> : <Tag color="red">offline</Tag>
                                             }}
                                     />
-                                    <Column title="Groups" dataIndex="groupsCount"
+                                    <Column title="Groups" dataIndex="groupsCount" align="center"
                                             render={(text, record:PeerDataTable, index) => {
                                                 return renderPopoverGroups(text, record.groups, record)
                                             }}
                                     />
+                                    <Column
+                                        title="SSH Server" dataIndex="ssh_enabled" align="center"
+                                            render={(e, record:PeerDataTable, index) => {
+                                                let isWindows = record.os.toLocaleLowerCase().startsWith("windows")
+                                                let toggle = <Switch size={"small"} checked={e}
+                                                                     disabled={isWindows}
+                                                                     onClick={(checked: boolean) => {
+                                                                         if (checked) {
+                                                                             showConfirmEnableSSH(record)
+                                                                         } else {
+                                                                             handleSwitchSSH(record, checked)
+                                                                         }
+                                                                     }}
+                                                />
+
+                                                if (isWindows) {
+                                                    return <Tooltip title="SSH server feature is not yet supported on Windows">
+                                                        {toggle}
+                                                    </Tooltip>
+                                                } else {
+                                                    return toggle
+                                                }
+                                            }
+                                    }
+                                    />
+
                                     <Column title="LastSeen" dataIndex="last_seen"
                                             render={(text, record, index) => {
                                                 return (record as PeerDataTable).connected ? 'just now' : timeAgo(text)